Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-04-27 09:21:56 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-04-27 09:21:56 +0300
commit58e61446dfe99c4c588324e183a5ff72b5164363 (patch)
tree4199d96eb20e7d3642f5967a6873dc927e10dbfc /source/blender/depsgraph/intern
parent4afbd0894191e68b15c74bb750209c4854f465f0 (diff)
Fix wrong scene assigned when using sets
Depsgraph was left with wrong set-scene.
Diffstat (limited to 'source/blender/depsgraph/intern')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc6
1 files changed, 3 insertions, 3 deletions
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 748a36d2c4d..aa04e0e888c 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
@@ -70,13 +70,13 @@ namespace DEG {
void DepsgraphRelationBuilder::build_scene(Main *bmain, Scene *scene)
{
- /* XXX store scene to access from DAG_get_scene */
- m_graph->scene = scene;
-
if (scene->set) {
build_scene(bmain, scene->set);
}
+ /* XXX store scene to access from DAG_get_scene */
+ m_graph->scene = scene;
+
/* scene objects */
FOREACH_SCENE_OBJECT(scene, ob)
{