Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-10-14 17:54:37 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-10-15 18:07:53 +0300
commitc2a7e790475d185fc73e7f4210f3e458535d88b8 (patch)
tree1f35a7bbc0fc1766fa95cc0c6188be56f67fcb40 /source/blender/depsgraph/intern/depsgraph_tag.cc
parentcb4fa01fcfdf4078c5091e56dfa3779d8c15be1b (diff)
Fix T70771: Texture nodes in Compositor causes infinite update
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_tag.cc')
-rw-r--r--source/blender/depsgraph/intern/depsgraph_tag.cc6
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)