[Bf-blender-cvs] [77377f0ea81] blender2.8: Depsgraph: Fix bug introduced by wrong merge conflict resolution

Sergey Sharybin noreply at git.blender.org
Thu Sep 21 13:10:07 CEST 2017


Commit: 77377f0ea8152d0ed5009a4940298b081b186787
Author: Sergey Sharybin
Date:   Thu Sep 21 16:09:49 2017 +0500
Branches: blender2.8
https://developer.blender.org/rB77377f0ea8152d0ed5009a4940298b081b186787

Depsgraph: Fix bug introduced by wrong merge conflict resolution

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

M	source/blender/depsgraph/intern/eval/deg_eval_flush.cc

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

diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index f5754f3b840..54a3a499e36 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -145,7 +145,7 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
 				lib_id_recalc_data_tag(bmain, id_orig);
 			}
 
-			if (comp_node->done == COMPONENT_STATE_DONE) {
+			if (comp_node->done != COMPONENT_STATE_DONE) {
 #ifdef WITH_COPY_ON_WRITE
 				/* Currently this is needed to get ob->mesh to be replaced with
 				 * original mesh (rather than being evaluated_mesh).



More information about the Bf-blender-cvs mailing list