[Bf-blender-cvs] [ed0901b47e1] blender2.8: Depsgraph: Forbid flush across scene->geometry operations

Sergey Sharybin noreply at git.blender.org
Tue May 15 17:21:46 CEST 2018


Commit: ed0901b47e1c8bdee2461643f779bffbff121894
Author: Sergey Sharybin
Date:   Tue May 15 14:35:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBed0901b47e1c8bdee2461643f779bffbff121894

Depsgraph: Forbid flush across scene->geometry operations

This relations is only to force geometry evaluation to happen
after scene's CoW is done. it was never meant to update geometry
when scene is being tagged.

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

M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 4fdd2d48529..e1eae851ec6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1670,7 +1670,8 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *object)
 	                       DEG_NODE_TYPE_PARAMETERS,
 	                       DEG_OPCODE_PLACEHOLDER,
 	                       "Scene Eval");
-	add_relation(scene_key, obdata_ubereval_key, "CoW Relation");
+	DepsRelation *rel = add_relation(scene_key, obdata_ubereval_key, "CoW Relation");
+	rel->flag |= DEPSREL_FLAG_NO_FLUSH;
 
 	/* Modifiers */
 	if (object->modifiers.first != NULL) {



More information about the Bf-blender-cvs mailing list