Merge branch 'master' into blender2.8

2018-04-23 09:34:50 +02:00 · 2018-04-23 09:34:50 +02:00 · 3aa75ba452
parent dea3ba6d81 fa7e19bca4
commit 3aa75ba452
1 changed files with 2 additions and 0 deletions
--- 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. */