refactor: group nodes now just use ST.NODE_TREE

Author: BrendanParmer

compositor/node_settings.py

@@ -455,6 +455,8 @@
 
 
     # MISC
+    'CompositorNodeGroup' : [("node_tree", ST.NODE_TREE)],
+
     'NodeFrame'       : [("label_size", ST.INT),
                          ("shrink", ST.BOOL),
                          ("text", ST.TEXT)],

compositor/operator.py

@@ -113,9 +113,6 @@ def _process_node(self, node: Node, ntp_nt: NTP_NodeTree):
         self._set_settings_defaults(node)
         self._hide_hidden_sockets(node)
 
-        if node.bl_idname == 'CompositorNodeGroup':
-            self._process_group_node_tree(node)
-
         if bpy.app.version < (4, 0, 0):
             if node.bl_idname == 'NodeGroupInput' and not ntp_nt.inputs_set:
                 self._group_io_settings(node, "input", ntp_nt)
@@ -185,7 +182,7 @@ def execute(self, context):
         if self.mode == 'ADDON':
             self._outer = "\t\t"
             self._inner = "\t\t\t"
-            
+
             self._setup_addon_directories(context, comp_var)
 
             self._file = open(f"{self._addon_dir}/__init__.py", "w")

geometry/node_settings.py

@@ -459,6 +459,8 @@
     'FunctionNodeQuaternionToRotation'  : [],
 
     # MISC
+    'GeometryNodeGroup' : [("node_tree", ST.NODE_TREE)],
+
     'NodeFrame'       : [("label_size", ST.INT),
                          ("shrink", ST.BOOL),
                          ("text", ST.TEXT)],

geometry/operator.py

@@ -84,10 +84,7 @@ def _process_node(self, node: Node, ntp_nt: NTP_GeoNodeTree) -> None:
                 self._group_io_settings(node, "output", ntp_nt)
                 ntp_nt.outputs_set = True
 
-        if node.bl_idname == 'GeometryNodeGroup':
-            self._process_group_node_tree(node)
-
-        elif node.bl_idname == 'GeometryNodeSimulationInput':
+        if node.bl_idname == 'GeometryNodeSimulationInput':
             ntp_nt.sim_inputs.append(node)
 
         elif node.bl_idname == 'GeometryNodeSimulationOutput':
@@ -101,7 +98,8 @@ def _process_node(self, node: Node, ntp_nt: NTP_GeoNodeTree) -> None:
 
         self._hide_hidden_sockets(node)
 
-        if node.bl_idname not in {'GeometryNodeSimulationInput', 'GeometryNodeRepeatInput'}:
+        if node.bl_idname not in {'GeometryNodeSimulationInput', 
+                                  'GeometryNodeRepeatInput'}:
             self._set_socket_defaults(node)
 
     if bpy.app.version >= (3, 6, 0):

material/node_settings.py

@@ -263,6 +263,8 @@
                           ("use_auto_update", ST.BOOL)],
 
     # MISC
+    'ShaderNodeGroup' : [('node_tree', ST.NODE_TREE)],
+
     'NodeFrame'       : [("label_size", ST.INT),
                          ("shrink", ST.BOOL),
                          ("text", ST.TEXT)],

material/operator.py

@@ -72,9 +72,6 @@ def _process_node(self, node: Node, ntp_nt: NTP_NodeTree) -> None:
                 self._group_io_settings(node, "output", ntp_nt)
                 ntp_nt.outputs_set = True
 
-        if node.bl_idname == 'ShaderNodeGroup':
-            self._process_group_node_tree(node)
-
         self._hide_hidden_sockets(node)
         self._set_socket_defaults(node)
 
@@ -135,7 +132,7 @@ def execute(self, context):
         if self.mode == 'ADDON':
             self._outer = "\t\t"
             self._inner = "\t\t\t"
-            
+
             self._setup_addon_directories(context, mat_var)
 
             self._file = open(f"{self._addon_dir}/__init__.py", "w")

ntp_operator.py

@@ -186,24 +186,6 @@ def dfs(nt: NodeTree) -> None:
 
         return result
 
-    def _process_group_node_tree(self, node: Node) -> None:
-        """
-        Processes node tree of group node if one is present
-
-        Parameters:
-        node (Node): the group node
-        """
-        node_tree = node.node_tree
-        if node_tree is None:
-            return
-        if node_tree in self._node_tree_vars:
-            nt_var = self._node_tree_vars[node_tree]
-            node_var = self._node_vars[node]
-            self._write(f"{node_var}.node_tree = {nt_var}")
-        else:
-            self.report({'WARNING'}, (f"NodeToPython: Node tree dependency graph " 
-                                      f"wasn't properly initialized"))
-
     def _create_var(self, name: str) -> str:
         """
         Creates a unique variable name for a node tree
@@ -325,6 +307,8 @@ def _set_settings_defaults(self, node: Node) -> None:
                 self._color_ramp_settings(node, attr_name)
             elif type == ST.CURVE_MAPPING:
                 self._curve_mapping_settings(node, attr_name)
+            elif type == ST.NODE_TREE:
+                self._node_tree_settings(node, attr_name)
             elif type == ST.IMAGE:
                 if self._addon_dir is not None and attr is not None:
                     if attr.source in {'FILE', 'GENERATED', 'TILED'}:
@@ -910,6 +894,25 @@ def _curve_mapping_settings(self, node: Node,
         self._write(f"#update curve after changes")
         self._write(f"{mapping_var}.update()")
 
+    def _node_tree_settings(self, node: Node, attr_name: str) -> None:
+        """
+        Processes node tree of group node if one is present
+
+        Parameters:
+        node (Node): the group node
+        attr_name (str): name of the node tree attribute
+        """
+        node_tree = getattr(node, attr_name)
+        if node_tree is None:
+            return
+        if node_tree in self._node_tree_vars:
+            nt_var = self._node_tree_vars[node_tree]
+            node_var = self._node_vars[node]
+            self._write(f"{node_var}.{attr_name} = {nt_var}")
+        else:
+            self.report({'WARNING'}, (f"NodeToPython: Node tree dependency graph " 
+                                    f"wasn't properly initialized"))
+
     def _save_image(self, img: bpy.types.Image) -> None:
         """
         Saves an image to an image directory of the add-on

utils.py

@@ -34,6 +34,7 @@ class ST(Enum):
     # Special settings
     COLOR_RAMP = auto()
     CURVE_MAPPING = auto()
+    NODE_TREE = auto()
 
     # Asset Library
     MATERIAL = auto() # Handle with asset library