[Bf-blender-cvs] [58e61446dfe] blender2.8: Fix wrong scene assigned when using sets
Campbell Barton
noreply at git.blender.org
Thu Apr 27 08:18:37 CEST 2017
Commit: 58e61446dfe99c4c588324e183a5ff72b5164363
Author: Campbell Barton
Date: Thu Apr 27 16:21:56 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB58e61446dfe99c4c588324e183a5ff72b5164363
Fix wrong scene assigned when using sets
Depsgraph was left with wrong set-scene.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
===================================================================
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)
{
More information about the Bf-blender-cvs
mailing list