[Bf-blender-cvs] [3aa75ba4529] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 3aa75ba4529f1f56e0845ebfbb451c8dbee18787
Author: Sergey Sharybin
Date:   Mon Apr 23 09:34:50 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3aa75ba4529f1f56e0845ebfbb451c8dbee18787

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 9577702e4bd,dfc20286565..ea5a5c0c2d7
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@@ -415,10 -413,10 +415,12 @@@ void DepsgraphRelationBuilder::build_ob
  	OperationKey ob_ubereval_key(&object->id,
  	                             DEG_NODE_TYPE_TRANSFORM,
  	                             DEG_OPCODE_TRANSFORM_OBJECT_UBEREVAL);
 +	/* Various flags, flushing from bases/collections. */
 +	build_object_flags(base, object);
  	/* Parenting. */
  	if (object->parent != NULL) {
+ 		/* Make sure parent object's relations are built. */
 -		build_object(object->parent);
++		build_object(NULL, object->parent);
  		/* Parent relationship. */
  		build_object_parent(object);
  		/* Local -> parent. */