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

[Sergey Sharybin]

Commit: db83f41bafacb429e8fb24ccc509aa91f5744146
Author: Sergey Sharybin
Date:   Wed Oct 25 14:42:49 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBdb83f41bafacb429e8fb24ccc509aa91f5744146

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index d7ef1c19c61,5df85c19b6c..31fc432ff58
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -832,16 -700,12 +832,14 @@@ void DepsgraphNodeBuilder::build_partic
  
  void DepsgraphNodeBuilder::build_cloth(Scene *scene, Object *object)
  {
 +	Scene *scene_cow = get_cow_datablock(scene);
 +	Object *object_cow = get_cow_datablock(object);
- 
- 	ComponentDepsNode *cache_comp = add_component_node(&object->id,
- 	                                                   DEG_NODE_TYPE_CACHE);
- 	add_operation_node(cache_comp,
+ 	add_operation_node(&object->id,
+ 	                   DEG_NODE_TYPE_CACHE,
  	                   function_bind(BKE_object_eval_cloth,
  	                                 _1,
 -	                                 scene,
 -	                                 object),
 +	                                 scene_cow,
 +	                                 object_cow),
  	                   DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER);
  }
  
@@@ -1087,7 -923,7 +1085,6 @@@ void DepsgraphNodeBuilder::build_lamp(O
  
  	build_animdata(&la->id);
  
- 	/* node for obdata */
 -	/* TODO(sergey): Is it really how we're supposed to work with drivers? */
  	add_operation_node(lamp_id,
  	                   DEG_NODE_TYPE_PARAMETERS,
  	                   NULL,