diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-02-09 18:46:05 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-02-09 18:46:05 +0300 |
commit | a41bbfb7f395c0dd022c5489afef4bae4d739c8c (patch) | |
tree | 13d3c854eef2df5f441716b4d58d2944d34597ab /source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc | |
parent | 1045026ea23c8dac9b74f3cb2f2b4dc24a5d88af (diff) |
Depsgraph fix for scene layers
Objects can be moved around freely now
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc | 14 |
1 files changed, 8 insertions, 6 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 507f2572927..c7e8edb122e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc @@ -46,6 +46,7 @@ extern "C" { #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_node.h" @@ -79,24 +80,25 @@ void DepsgraphNodeBuilder::build_scene(Main *bmain, Scene *scene) } /* scene objects */ - LINKLIST_FOREACH (BaseLegacy *, base, &scene->base) { - Object *ob = base->object; - + Object *ob; + FOREACH_SCENE_OBJECT(scene, ob) + { /* object itself */ - build_object(scene, base, ob); + build_object(scene, ob); /* object that this is a proxy for */ // XXX: the way that proxies work needs to be completely reviewed! if (ob->proxy) { ob->proxy->proxy_from = ob; - build_object(scene, base, ob->proxy); + build_object(scene, ob->proxy); } /* Object dupligroup. */ if (ob->dup_group) { - build_group(scene, base, ob->dup_group); + build_group(scene, ob->dup_group); } } + FOREACH_SCENE_OBJECT_END /* rigidbody */ if (scene->rigidbody_world) { |