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

[Sergey Sharybin]

Commit: 3248eef697dedc777a2748f8f63e9031dfe5b599
Author: Sergey Sharybin
Date:   Fri May 4 12:50:40 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3248eef697dedc777a2748f8f63e9031dfe5b599

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
index 208462713a5,5824858d7ed..c48381481f5
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
@@@ -144,32 -141,19 +144,32 @@@ void DepsgraphNodeBuilder::build_spline
  /* Pose/Armature Bones Graph */
  void DepsgraphNodeBuilder::build_rig(Object *object)
  {
 -	bArmature *arm = (bArmature *)object->data;
 +	bArmature *armature = (bArmature *)object->data;
 +	Scene *scene_cow;
 +	Object *object_cow;
 +	if (DEG_depsgraph_use_copy_on_write()) {
 +		scene_cow = get_cow_datablock(scene_);
 +		object_cow = get_cow_datablock(object);
 +	}
 +	else {
 +		scene_cow = scene_;
 +		object_cow = object;
 +	}
  	OperationDepsNode *op_node;
  
 -	/* animation and/or drivers linking posebones to base-armature used to define them
 +	/* Animation and/or drivers linking posebones to base-armature used to
 +	 * define them.
 +	 *
  	 * NOTE: AnimData here is really used to control animated deform properties,
 -	 *       which ideally should be able to be unique across different instances.
 -	 *       Eventually, we need some type of proxy/isolation mechanism in-between here
 -	 *       to ensure that we can use same rig multiple times in same scene...
 +	 *       which ideally should be able to be unique across different
 +	 *       instances. Eventually, we need some type of proxy/isolation
 +	 *       mechanism in-between here to ensure that we can use same rig
 +	 *       multiple times in same scene.
  	 */
- 	if (!built_map_.checkIsBuilt(armature)) {
 -	if (!built_map_.checkIsBuiltAndTag(arm)) {
 -		build_animdata(&arm->id);
++	if (!built_map_.checkIsBuiltAndTag(armature)) {
 +		build_animdata(&armature->id);
  		/* Make sure pose is up-to-date with armature updates. */
 -		add_operation_node(&arm->id,
 +		add_operation_node(&armature->id,
  		                   DEG_NODE_TYPE_PARAMETERS,
  		                   NULL,
  		                   DEG_OPCODE_PLACEHOLDER,