[Bf-blender-cvs] [82e7956f12a] master: Fix T96396: cannot set active node group output with Python

Jacques Lucke noreply at git.blender.org
Mon Mar 14 10:22:04 CET 2022


Commit: 82e7956f12aa4ee06cb27d902cc5c518af1ef177
Author: Jacques Lucke
Date:   Mon Mar 14 10:21:19 2022 +0100
Branches: master
https://developer.blender.org/rB82e7956f12aa4ee06cb27d902cc5c518af1ef177

Fix T96396: cannot set active node group output with Python

This is essentially the same fix as in rB22a341d9d8d3d337f79df228ab2e4e0726f81430.

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

M	source/blender/makesrna/intern/rna_nodetree.c

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

diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 640fe3b919b..d1c37eff36f 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -4539,6 +4539,24 @@ static void rna_ShaderNode_is_active_output_set(PointerRNA *ptr, bool value)
   }
 }
 
+static void rna_GroupOutput_is_active_output_set(PointerRNA *ptr, bool value)
+{
+  bNodeTree *ntree = (bNodeTree *)ptr->owner_id;
+  bNode *node = ptr->data;
+  if (value) {
+    /* Make sure that no other group output is active at the same time. */
+    LISTBASE_FOREACH (bNode *, other_node, &ntree->nodes) {
+      if (other_node->type == NODE_GROUP_OUTPUT) {
+        other_node->flag &= ~NODE_DO_OUTPUT;
+      }
+    }
+    node->flag |= NODE_DO_OUTPUT;
+  }
+  else {
+    node->flag &= ~NODE_DO_OUTPUT;
+  }
+}
+
 static PointerRNA rna_ShaderNodePointDensity_psys_get(PointerRNA *ptr)
 {
   bNode *node = ptr->data;
@@ -4917,6 +4935,7 @@ static void def_group_output(StructRNA *srna)
   RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_DO_OUTPUT);
   RNA_def_property_ui_text(
       prop, "Active Output", "True if this node is used as the active group output");
+  RNA_def_property_boolean_funcs(prop, NULL, "rna_GroupOutput_is_active_output_set");
   RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }



More information about the Bf-blender-cvs mailing list