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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-24 18:49:42 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-24 18:55:33 +0300
commit8a1a0532503681ce5b4f5ec9ab8c2c8ccd13d120 (patch)
treefb5449b972b860866f1c016fec4f8b57fd9090c2 /source/blender/makesrna/intern/rna_scene.c
parent6130524d8c05cb2468266f2e6fc5374d40cec6e1 (diff)
Depsgraph: Tag background scene for base flags update
When setting background object, it might pull new objects in and those objects will not have proper flags unless on_visible_update() was called afterwards.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
-rw-r--r--source/blender/makesrna/intern/rna_scene.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 81e3d811122..682e0ff3404 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -683,7 +683,13 @@ void rna_Scene_set_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
Scene *scene = (Scene *)ptr->id.data;
DEG_relations_tag_update(bmain);
- DEG_id_tag_update(&scene->id, 0);
+ DEG_id_tag_update_ex(bmain, &scene->id, 0);
+ if (scene->set != NULL) {
+ /* Objects which are pulled into main scene's depsgraph needs to have
+ * their base flags updated.
+ */
+ DEG_id_tag_update_ex(bmain, &scene->set->id, 0);
+ }
}
static void rna_Scene_layer_set(PointerRNA *ptr, const int *values)