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

[Sergey Sharybin]

Commit: 539987766ba3bf2b866c39df4a8476353e3400d9
Author: Sergey Sharybin
Date:   Thu Feb 22 14:08:27 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB539987766ba3bf2b866c39df4a8476353e3400d9

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 325596f54fe,0d85b1dfc93..f9d0349a5dc
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@@ -1626,24 -1534,12 +1626,23 @@@ void DepsgraphRelationBuilder::build_ob
  	/* link components to each other */
  	add_relation(obdata_geom_key, geom_key, "Object Geometry Base Data");
  
 +	OperationKey obdata_ubereval_key(&object->id,
 +	                                 DEG_NODE_TYPE_GEOMETRY,
 +	                                 DEG_OPCODE_GEOMETRY_UBEREVAL);
 +
 +	/* Special case: modifiers and DerivedMesh creation queries scene for various
 +	 * things like data mask to be used. We add relation here to ensure object is
 +	 * never evaluated prior to Scene's CoW is ready.
 +	 */
 +	OperationKey scene_key(&scene_->id,
 +	                       DEG_NODE_TYPE_PARAMETERS,
 +	                       DEG_OPCODE_PLACEHOLDER,
 +	                       "Scene Eval");
 +	add_relation(scene_key, obdata_ubereval_key, "CoW Relation");
 +
  	/* Modifiers */
  	if (object->modifiers.first != NULL) {
 -		OperationKey obdata_ubereval_key(&object->id,
 -		                                 DEG_NODE_TYPE_GEOMETRY,
 -		                                 DEG_OPCODE_GEOMETRY_UBEREVAL);
  		ModifierUpdateDepsgraphContext ctx = {};
- 		ctx.bmain = bmain_;
  		ctx.scene = scene_;
  		ctx.object = object;