[Bf-blender-cvs] [b81f1b8cf17] blender-v3.2-release: Fix T98231: missing update when material output is in group

[Jacques Lucke]

Commit: b81f1b8cf17196122a7203dc79f4c20c1cd9d5bf
Author: Jacques Lucke
Date:   Mon May 23 09:03:33 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBb81f1b8cf17196122a7203dc79f4c20c1cd9d5bf

Fix T98231: missing update when material output is in group

Differential Revision: https://developer.blender.org/D14998

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

M	source/blender/blenkernel/intern/node_tree_update.cc
M	source/blender/makesdna/DNA_node_types.h

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

diff --git a/source/blender/blenkernel/intern/node_tree_update.cc b/source/blender/blenkernel/intern/node_tree_update.cc
index 8afe7ce7520..68e4cccba00 100644
--- a/source/blender/blenkernel/intern/node_tree_update.cc
+++ b/source/blender/blenkernel/intern/node_tree_update.cc
@@ -985,7 +985,7 @@ class NodeTreeMainUpdater {
     this->remove_unused_previews_when_necessary(ntree);
 
     this->ensure_tree_ref(ntree, tree_ref);
-    this->update_has_image_animation(*tree_ref);
+    this->propagate_runtime_flags(*tree_ref);
     if (ntree.type == NTREE_GEOMETRY) {
       if (node_field_inferencing::update_field_inferencing(*tree_ref)) {
         result.interface_changed = true;
@@ -1256,10 +1256,10 @@ class NodeTreeMainUpdater {
     BKE_node_preview_remove_unused(&ntree);
   }
 
-  void update_has_image_animation(const NodeTreeRef &tree_ref)
+  void propagate_runtime_flags(const NodeTreeRef &tree_ref)
   {
     bNodeTree &ntree = *tree_ref.btree();
-    ntree.runtime_flag &= ~NTREE_RUNTIME_FLAG_HAS_IMAGE_ANIMATION;
+    ntree.runtime_flag = 0;
     if (ntree.type != NTREE_SHADER) {
       return;
     }
@@ -1268,21 +1268,30 @@ class NodeTreeMainUpdater {
     for (const NodeRef *group_node : tree_ref.nodes_by_type("NodeGroup")) {
       const bNodeTree *group = reinterpret_cast<bNodeTree *>(group_node->bnode()->id);
       if (group != nullptr) {
-        if (group->runtime_flag & NTREE_RUNTIME_FLAG_HAS_IMAGE_ANIMATION) {
-          ntree.runtime_flag |= NTREE_RUNTIME_FLAG_HAS_IMAGE_ANIMATION;
-          return;
-        }
+        ntree.runtime_flag |= group->runtime_flag;
       }
     }
     /* Check if the tree itself has an animated image. */
-    for (const StringRefNull idname : {"ShaderNodeTexImage", "ShaderNodeTexEnvironment"})
+    for (const StringRefNull idname : {"ShaderNodeTexImage", "ShaderNodeTexEnvironment"}) {
       for (const NodeRef *node : tree_ref.nodes_by_type(idname)) {
         Image *image = reinterpret_cast<Image *>(node->bnode()->id);
         if (image != nullptr && BKE_image_is_animated(image)) {
           ntree.runtime_flag |= NTREE_RUNTIME_FLAG_HAS_IMAGE_ANIMATION;
-          return;
+          break;
         }
       }
+    }
+    /* Check if the tree has a material output. */
+    for (const StringRefNull idname : {"ShaderNodeOutputMaterial",
+                                       "ShaderNodeOutputLight",
+                                       "ShaderNodeOutputWorld",
+                                       "ShaderNodeOutputAOV"}) {
+      const Span<const NodeRef *> nodes = tree_ref.nodes_by_type(idname);
+      if (!nodes.is_empty()) {
+        ntree.runtime_flag |= NTREE_RUNTIME_FLAG_HAS_MATERIAL_OUTPUT;
+        break;
+      }
+    }
   }
 
   void update_node_levels(bNodeTree &ntree)
@@ -1392,10 +1401,12 @@ class NodeTreeMainUpdater {
       return true;
     }
     /* Assume node groups without output sockets are outputs. */
-    /* TODO: Store whether a node group contains a top-level output node (e.g. Material Output) in
-     * run-time information on the node group itself. */
-    if (bnode.type == NODE_GROUP && node.outputs().is_empty()) {
-      return true;
+    if (bnode.type == NODE_GROUP) {
+      const bNodeTree *node_group = reinterpret_cast<const bNodeTree *>(bnode.id);
+      if (node_group != nullptr &&
+          node_group->runtime_flag & NTREE_RUNTIME_FLAG_HAS_MATERIAL_OUTPUT) {
+        return true;
+      }
     }
     return false;
   }
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index b66fe31c00e..e7e8ab3dd61 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -610,6 +610,8 @@ typedef enum eNodeTreeExecutionMode {
 typedef enum eNodeTreeRuntimeFlag {
   /** There is a node that references an image with animation. */
   NTREE_RUNTIME_FLAG_HAS_IMAGE_ANIMATION = 1 << 0,
+  /** There is a material output node in the group. */
+  NTREE_RUNTIME_FLAG_HAS_MATERIAL_OUTPUT = 1 << 1,
 } eNodeTreeRuntimeFlag;
 
 /* socket value structs for input buttons