diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-10-15 18:08:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-10-15 18:08:20 +0300 |
| commit | 4ace5931964be9ed748ac286717b5a0327dcd049 (patch) | |
| tree | e9266eb2aba4dcb5194468872d80a7e55c64504b /source | |
| parent | 622324f717e6fe4a554162d9eb118218bf3e3d46 (diff) | |
| parent | c2a7e790475d185fc73e7f4210f3e458535d88b8 (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_tag.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 7f025097843..ce5917110d6 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -367,7 +367,7 @@ static void graph_id_tag_update_single_flag(Main *bmain, eUpdateSource update_source) { if (tag == ID_RECALC_EDITORS) { - if (graph != NULL) { + if (graph != NULL && graph->is_active) { depsgraph_update_editors_tag(bmain, graph, id); } return; @@ -462,8 +462,8 @@ const char *update_source_as_string(eUpdateSource source) int deg_recalc_flags_for_legacy_zero() { - return ID_RECALC_ALL & - ~(ID_RECALC_PSYS_ALL | ID_RECALC_ANIMATION | ID_RECALC_SOURCE | ID_RECALC_TIME); + return ID_RECALC_ALL & ~(ID_RECALC_PSYS_ALL | ID_RECALC_ANIMATION | ID_RECALC_SOURCE | + ID_RECALC_TIME | ID_RECALC_EDITORS); } int deg_recalc_flags_effective(Depsgraph *graph, int flags) |