[Bf-blender-cvs] [c2a7e790475] blender-v2.81-release: Fix T70771: Texture nodes in Compositor causes infinite update

[Sergey Sharybin]

Commit: c2a7e790475d185fc73e7f4210f3e458535d88b8
Author: Sergey Sharybin
Date:   Mon Oct 14 16:54:37 2019 +0200
Branches: blender-v2.81-release
https://developer.blender.org/rBc2a7e790475d185fc73e7f4210f3e458535d88b8

Fix T70771: Texture nodes in Compositor causes infinite update

===================================================================

M	source/blender/depsgraph/intern/depsgraph_tag.cc

===================================================================

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)