diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-19 19:08:14 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-19 19:08:14 +0300 |
| commit | af170839afc6334bb3ce9ea62624c6c103707dc6 (patch) | |
| tree | f3536c500ad8982ce9d49dcd8014ce37904575a3 /source/blender/depsgraph/intern | |
| parent | 2cdc2f2a2542f31c1c11a9913830f0ff7846888a (diff) | |
| parent | b31faac17eaf66e034107f136bb00dd16361a0bf (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern')
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_flush.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc index 676df7d6335..f5754f3b840 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc @@ -230,8 +230,8 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph) } } - id_node->done = COMPONENT_STATE_DONE; - comp_node->done = 1; + id_node->done = 1; + comp_node->done = COMPONENT_STATE_DONE; /* Flush to nodes along links... */ /* TODO(sergey): This is mainly giving speedup due ot less queue pushes, which |