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

[Sergey Sharybin]

Commit: d8da33d21c2fa6035e7dafbea66880d3f3c84cea
Author: Sergey Sharybin
Date:   Wed Oct 25 11:48:20 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBd8da33d21c2fa6035e7dafbea66880d3f3c84cea

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index a4c3c11d922,0228e619f54..d7ef1c19c61
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -839,10 -706,9 +840,9 @@@ void DepsgraphNodeBuilder::build_cloth(
  	add_operation_node(cache_comp,
  	                   function_bind(BKE_object_eval_cloth,
  	                                 _1,
 -	                                 scene,
 -	                                 object),
 +	                                 scene_cow,
 +	                                 object_cow),
- 	                   DEG_OPCODE_PLACEHOLDER,
- 	                   "Cloth Modifier");
+ 	                   DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER);
  }
  
  /* Shapekeys */
@@@ -1277,35 -1109,15 +1274,40 @@@ void DepsgraphNodeBuilder::build_mask(M
  	                   DEG_OPCODE_MASK_EVAL);
  }
  
 -void DepsgraphNodeBuilder::build_movieclip(MovieClip *clip) {
 +void DepsgraphNodeBuilder::build_movieclip(MovieClip *clip)
 +{
  	ID *clip_id = &clip->id;
- 	add_id_node(clip_id);
+ 	/* Animation. */
  	build_animdata(clip_id);
+ 	/* Movie clip evaluation. */
+ 	add_operation_node(clip_id,
+ 	                   DEG_NODE_TYPE_PARAMETERS,
+ 	                   function_bind(BKE_movieclip_eval_update, _1, clip),
+ 	                   DEG_OPCODE_MOVIECLIP_EVAL);
  }
  
 +void DepsgraphNodeBuilder::build_lightprobe(Object *object)
 +{
 +	LightProbe *probe = (LightProbe *)object->data;
 +	ID *probe_id = &probe->id;
 +	if (probe_id->tag & LIB_TAG_DOIT) {
 +		return;
 +	}
 +	probe_id->tag |= LIB_TAG_DOIT;
 +	/* Placeholder so we can add relations and tag ID node for update. */
 +	add_operation_node(probe_id,
 +	                   DEG_NODE_TYPE_PARAMETERS,
 +	                   NULL,
 +	                   DEG_OPCODE_PLACEHOLDER,
 +	                   "LightProbe Eval");
 +
 +	add_operation_node(&object->id,
 +	                   DEG_NODE_TYPE_PARAMETERS,
 +	                   NULL,
 +	                   DEG_OPCODE_PLACEHOLDER,
 +	                   "LightProbe Eval");
 +
 +	build_animdata(probe_id);
 +}
 +
  }  // namespace DEG
diff --cc source/blender/depsgraph/intern/depsgraph_type_defines.cc
index 0d42acf382a,e5bdaf79366..6dfe1565bb1
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
@@@ -137,16 -137,10 +139,18 @@@ static const char *stringify_opcode(eDe
  		/* Masks. */
  		STRINGIFY_OPCODE(MASK_ANIMATION);
  		STRINGIFY_OPCODE(MASK_EVAL);
 +		/* Collections. */
 +		STRINGIFY_OPCODE(SCENE_LAYER_INIT);
 +		STRINGIFY_OPCODE(SCENE_LAYER_EVAL);
 +		STRINGIFY_OPCODE(SCENE_LAYER_DONE);
 +		/* Copy on write. */
 +		STRINGIFY_OPCODE(COPY_ON_WRITE);
  		/* Shading. */
  		STRINGIFY_OPCODE(SHADING);
 +		STRINGIFY_OPCODE(MATERIAL_UPDATE);
 +		STRINGIFY_OPCODE(WORLD_UPDATE);
+ 		/* Movie clip. */
+ 		STRINGIFY_OPCODE(MOVIECLIP_EVAL);
  
  		case DEG_NUM_OPCODES: return "SpecialCase";
  #undef STRINGIFY_OPCODE
diff --cc source/blender/depsgraph/intern/depsgraph_types.h
index abdedd8adb6,03d98c85148..6f5eeff43df
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@@ -226,10 -209,8 +228,10 @@@ typedef enum eDepsOperation_Code 
  
  	/* Shading. ------------------------------------------- */
  	DEG_OPCODE_SHADING,
 +	DEG_OPCODE_MATERIAL_UPDATE,
 +	DEG_OPCODE_WORLD_UPDATE,
  
- 	/* Masks ------------------------------------------- */
+ 	/* Masks. ------------------------------------------ */
  	DEG_OPCODE_MASK_ANIMATION,
  	DEG_OPCODE_MASK_EVAL,