diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-24 16:27:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-24 17:46:25 +0300 |
| commit | ad288c9c3494f8626af084889515a63e8b2dfe27 (patch) | |
| tree | aab369b25c9f65a448908b2bd011af56cd655e24 /source | |
| parent | 33b8a3f9e829323ca9a2573227f4d451d611296b (diff) | |
Depsgraph: Fix race condition when object is coming from both scene and set
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index f9b7a5b1ceb..f2805cc9a7c 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -426,6 +426,9 @@ void DepsgraphRelationBuilder::build_group(Object *object, Group *group) void DepsgraphRelationBuilder::build_object(Base *base, Object *object) { if (object->id.tag & LIB_TAG_DOIT) { + if (base != NULL) { + build_object_flags(base, object); + } return; } object->id.tag |= LIB_TAG_DOIT; |