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

[Sergey Sharybin]

Commit: cac2415d829aca6f4d0b6f497c08c7d18efd5853
Author: Sergey Sharybin
Date:   Wed Mar 21 12:47:13 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBcac2415d829aca6f4d0b6f497c08c7d18efd5853

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 80daa306bff,15e3ea3e10f..b7d07d5c7ef
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -981,21 -747,9 +986,10 @@@ void DepsgraphNodeBuilder::build_shapek
  // XXX: what happens if the datablock is shared!
  void DepsgraphNodeBuilder::build_obdata_geom(Object *object)
  {
 -	ID *obdata = (ID *)object->data;
  	OperationDepsNode *op_node;
 +	Scene *scene_cow = get_cow_datablock(scene_);
 +	Object *object_cow = get_cow_datablock(object);
  
- 	/* TODO(sergey): This way using this object's properties as driver target
- 	 * works fine.
- 	 *
- 	 * Does this depend on other nodes?
- 	 */
- 	op_node = add_operation_node(&object->id,
- 	                             DEG_NODE_TYPE_PARAMETERS,
- 	                             NULL,
- 	                             DEG_OPCODE_PARAMETERS_EVAL);
- 	op_node->set_as_exit();
- 
  	/* Temporary uber-update node, which does everything.
  	 * It is for the being we're porting old dependencies into the new system.
  	 * We'll get rid of this node as soon as all the granular update functions