From 867cd8218a6ebf2703c1e3097ff7fcf7a46ebae8 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 8 Jul 2019 17:37:58 +0200 Subject: [PATCH] Fix T66556: Noisy drivers relations in certain cases --- .../depsgraph/intern/builder/deg_builder_nodes_scene.cc | 2 +- .../depsgraph/intern/builder/deg_builder_relations_scene.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc index 3486d2c92ae..777512acf89 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc @@ -56,8 +56,8 @@ void DepsgraphNodeBuilder::build_scene_parameters(Scene *scene) if (built_map_.checkIsBuiltAndTag(scene, BuilderMap::TAG_PARAMETERS)) { return; } + build_parameters(&scene->id); add_operation_node(&scene->id, NodeType::PARAMETERS, OperationCode::SCENE_EVAL); - add_operation_node(&scene->id, NodeType::PARAMETERS, OperationCode::PARAMETERS_EVAL); /* NOTE: This is a bit overkill and can potentially pull a bit too much into the graph, but: * * - We definitely need an ID node for the scene's compositor, otherwise re-mapping will no diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc index daaf90011c5..4e0c2cbba0c 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc @@ -52,8 +52,9 @@ void DepsgraphRelationBuilder::build_scene_parameters(Scene *scene) if (built_map_.checkIsBuiltAndTag(scene, BuilderMap::TAG_PARAMETERS)) { return; } + build_parameters(&scene->id); OperationKey parameters_eval_key( - &scene->id, NodeType::PARAMETERS, OperationCode::PARAMETERS_EVAL); + &scene->id, NodeType::PARAMETERS, OperationCode::PARAMETERS_EXIT); OperationKey scene_eval_key(&scene->id, NodeType::PARAMETERS, OperationCode::SCENE_EVAL); add_relation(parameters_eval_key, scene_eval_key, "Parameters -> Scene Eval"); }