blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Depsgraph: Fix bug introduced by wrong merge conflict resolution

This commit is contained in:
Sergey Sharybin 2017-09-21 16:09:49 +05:00
parent 549c4bec9d
commit 77377f0ea8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
View File

@ -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).