diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-21 14:09:49 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-21 14:09:49 +0300 |
| commit | 77377f0ea8152d0ed5009a4940298b081b186787 (patch) | |
| tree | ab6417f6c1c650da520a34685fa7d7102d17951a /source | |
| parent | 549c4bec9d8256546ef550106b9662a222ce0bbd (diff) | |
Depsgraph: Fix bug introduced by wrong merge conflict resolution
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_flush.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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). |