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

[Sergey Sharybin]

Commit: d54a058f35d3fa9cf7d78042e7119532fc93c33b
Author: Sergey Sharybin
Date:   Wed Apr 4 10:16:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd54a058f35d3fa9cf7d78042e7119532fc93c33b

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
index c8fbc5e2e9a,db8f987fa39..2147ffce7b8
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@@ -431,9 -436,10 +431,10 @@@ void DepsgraphRelationBuilder::build_ri
  
  		/* assume that all bones must be done for the pose to be ready (for deformers) */
  		add_relation(bone_done_key, flush_key, "PoseEval Result-Bone Link");
+ 
  		/* Custom shape. */
  		if (pchan->custom != NULL) {
 -			build_object(pchan->custom);
 +			build_object(NULL, pchan->custom);
  		}
  	}
  }