[Bf-blender-cvs] [f19e8eaa4b5] blender2.8: Depsgraph: Avoid redundant copy-on-write relations

Sergey Sharybin noreply at git.blender.org
Mon Apr 23 12:19:12 CEST 2018


Commit: f19e8eaa4b529988e89d5c2e2965728351bc3465
Author: Sergey Sharybin
Date:   Mon Apr 23 12:18:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf19e8eaa4b529988e89d5c2e2965728351bc3465

Depsgraph: Avoid redundant copy-on-write relations

Was adding some relations twice. Harmless, but means extra stuff to do
when evaluating the scene.

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

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 ea5a5c0c2d7..9a59dd46759 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -2009,6 +2009,9 @@ void DepsgraphRelationBuilder::build_copy_on_write_relations(IDDepsNode *id_node
 		/* All dangling operations should also be executed after copy-on-write. */
 		GHASH_FOREACH_BEGIN(OperationDepsNode *, op_node, comp_node->operations_map)
 		{
+			if (op_node == op_entry) {
+				continue;
+			}
 			if (op_node->inlinks.size() == 0) {
 				graph_->add_new_relation(op_cow, op_node, "CoW Dependency");
 			}



More information about the Bf-blender-cvs mailing list