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
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-04-23 10:34:50 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-04-23 10:35:20 +0300
commit3aa75ba4529f1f56e0845ebfbb451c8dbee18787 (patch)
tree1efcae39f9554d9fe74649b1b1e8dc16ad3de330 /source
parentdea3ba6d81843f4eac67713961963f5d12997831 (diff)
parentfa7e19bca43057ea6a722261f82e372893f49a24 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc2
1 files changed, 2 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 9577702e4bd..ea5a5c0c2d7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -419,6 +419,8 @@ void DepsgraphRelationBuilder::build_object(Base *base, Object *object)
build_object_flags(base, object);
/* Parenting. */
if (object->parent != NULL) {
+ /* Make sure parent object's relations are built. */
+ build_object(NULL, object->parent);
/* Parent relationship. */
build_object_parent(object);
/* Local -> parent. */