refactor: cleanup

Author: BrendanParmer

compositor/operator.py

@@ -93,13 +93,15 @@ def _process_node(self, node: Node, ntp_nt: NTP_NodeTree, inner: str):
 
         if node.bl_idname == 'CompositorNodeGroup':
             self._process_group_node_tree(node, node_var, inner)
-        elif node.bl_idname == 'NodeGroupInput' and not ntp_nt.inputs_set:
-            self._group_io_settings(node, inner, "input", ntp_nt)
-            ntp_nt.inputs_set = True
 
-        elif node.bl_idname == 'NodeGroupOutput' and not ntp_nt.outputs_set:
-            self._group_io_settings(node, inner, "output", ntp_nt)
-            ntp_nt.outputs_set = True
+        if bpy.app.version < (4, 0, 0):
+            if node.bl_idname == 'NodeGroupInput' and not ntp_nt.inputs_set:
+                self._group_io_settings(node, inner, "input", ntp_nt)
+                ntp_nt.inputs_set = True
+
+            elif node.bl_idname == 'NodeGroupOutput' and not ntp_nt.outputs_set:
+                self._group_io_settings(node, inner, "output", ntp_nt)
+                ntp_nt.outputs_set = True
 
         self._set_socket_defaults(node, node_var, inner)
 
@@ -124,6 +126,9 @@ def _process_node_tree(self, node_tree, level):
         ntp_nt = NTP_NodeTree(node_tree, nt_var)
         self._initialize_compositor_node_tree(outer, ntp_nt, nt_name)
 
+        if bpy.app.version >= (4, 0, 0):
+            self._tree_interface_settings(inner, ntp_nt)
+
         #initialize nodes
         self._write(f"{inner}#initialize {nt_var} nodes\n")
 

geometry/operator.py

@@ -69,16 +69,18 @@ def _process_node(self, node: Node, ntp_node_tree: NTP_GeoNodeTree,
         #create node
         node_var: str = self._create_node(node, inner, ntp_node_tree.var)
         self._set_settings_defaults(node, inner, node_var)
-        if node.bl_idname == 'GeometryNodeGroup':
-            self._process_group_node_tree(node, node_var, inner)
 
-        elif node.bl_idname == 'NodeGroupInput' and not ntp_node_tree.inputs_set:
-            self._group_io_settings(node, inner, "input", ntp_node_tree)
-            ntp_node_tree.inputs_set = True
+        if bpy.app.version < (4, 0, 0):
+            if node.bl_idname == 'NodeGroupInput' and not ntp_node_tree.inputs_set:
+                self._group_io_settings(node, inner, "input", ntp_node_tree)
+                ntp_node_tree.inputs_set = True
+
+            elif node.bl_idname == 'NodeGroupOutput' and not ntp_node_tree.outputs_set:
+                self._group_io_settings(node, inner, "output", ntp_node_tree)
+                ntp_node_tree.outputs_set = True
 
-        elif node.bl_idname == 'NodeGroupOutput' and not ntp_node_tree.outputs_set:
-            self._group_io_settings(node, inner, "output", ntp_node_tree)
-            ntp_node_tree.outputs_set = True
+        if node.bl_idname == 'GeometryNodeGroup':
+            self._process_group_node_tree(node, node_var, inner)
 
         elif node.bl_idname == 'GeometryNodeSimulationInput':
             ntp_node_tree.sim_inputs.append(node)
@@ -169,7 +171,7 @@ def _process_node_tree(self, node_tree: GeometryNodeTree,
         ntp_nt = NTP_GeoNodeTree(node_tree, nt_var)
 
         if bpy.app.version >= (4, 0, 0):
-            self._tree_interface_settings_v4(inner, ntp_nt)
+            self._tree_interface_settings(inner, ntp_nt)
 
         for node in node_tree.nodes:
             self._process_node(node, ntp_nt, inner)

material/operator.py

@@ -65,16 +65,18 @@ def _process_node(self, node: Node, ntp_node_tree: NTP_NodeTree, inner: str) ->
         """
         node_var: str = self._create_node(node, inner, ntp_node_tree.var)
         self._set_settings_defaults(node, inner, node_var)
-                                
+        
+        if bpy.app.version < (4, 0, 0):
+            if node.bl_idname == 'NodeGroupInput' and not ntp_node_tree.inputs_set:
+                self._group_io_settings(node, inner, "input", ntp_node_tree)
+                ntp_node_tree.inputs_set = True
+
+            elif node.bl_idname == 'NodeGroupOutput' and not ntp_node_tree.outputs_set:
+                self._group_io_settings(node, inner, "output", ntp_node_tree)
+                ntp_node_tree.outputs_set = True
+
         if node.bl_idname == 'ShaderNodeGroup':
             self._process_group_node_tree(node, node_var, inner)
-        elif node.bl_idname == 'NodeGroupInput' and not ntp_node_tree.inputs_set:
-            self._group_io_settings(node, inner, "input", ntp_node_tree)
-            ntp_node_tree.inputs_set = True
-
-        elif node.bl_idname == 'NodeGroupOutput' and not ntp_node_tree.outputs_set:
-            self._group_io_settings(node, inner, "output", ntp_node_tree)
-            ntp_node_tree.outputs_set = True
 
         self._hide_hidden_sockets(node, inner, node_var)
         self._set_socket_defaults(node, node_var, inner)
@@ -102,6 +104,9 @@ def _process_node_tree(self, node_tree: ShaderNodeTree, level: int) -> None:
 
         self._initialize_shader_node_tree(outer, ntp_nt, nt_name)
 
+        if bpy.app.version >= (4, 0, 0):
+            self._tree_interface_settings(inner, ntp_nt)
+
         #initialize nodes
         self._write(f"{inner}#initialize {nt_var} nodes\n")
 

ntp_node_tree.py

@@ -1,4 +1,5 @@
 from bpy.types import NodeTree
+import bpy
 
 class NTP_NodeTree:
     def __init__(self, node_tree: NodeTree, var: str):
@@ -8,7 +9,8 @@ def __init__(self, node_tree: NodeTree, var: str):
         # The variable named for the regenerated node tree
         self.var: str = var
 
-        # Keep track of if we need to set the default values for the node
-        # tree inputs and outputs
-        self.inputs_set: bool = False
-        self.outputs_set: bool = False
+        if bpy.app.version < (4, 0, 0):
+            # Keep track of if we need to set the default values for the node
+            # tree inputs and outputs
+            self.inputs_set: bool = False
+            self.outputs_set: bool = False