Merge pull request #136 from BrendanParmer/Blender-4.3

Blender 4.3

Author: BrendanParmer

CONTRIBUTORS.md

@@ -0,0 +1,3 @@
+* [Brendan Parmer](https://github.com/BrendanParmer)
+* [Carlsu](https://github.com/carls3d)
+* [atticus-lv](https://github.com/atticus-lv)

NodeToPython/__init__.py

@@ -2,7 +2,7 @@
     "name": "Node to Python", 
     "description": "Convert Blender node groups to a Python add-on!",
     "author": "Brendan Parmer",
-    "version": (3, 2, 1),
+    "version": (3, 3, 0),
     "blender": (3, 0, 0),
     "location": "Node", 
     "category": "Node",

NodeToPython/blender_manifest.toml

@@ -1,7 +1,7 @@
 schema_version = "1.0.0"
 
 id = "node_to_python"
-version = "3.2.1"
+version = "3.3.0"
 name = "Node To Python"
 tagline = "Turn node groups into Python code"
 maintainer = "Brendan Parmer <[email protected]>"
@@ -12,7 +12,7 @@ website = "https://github.com/BrendanParmer/NodeToPython"
 tags = ["Development", "Compositing", "Geometry Nodes", "Material", "Node"]
 
 blender_version_min = "4.2.0"
-blender_version_max = "4.3.0"
+blender_version_max = "4.4.0"
 
 license = [
     "SPDX:MIT",

NodeToPython/compositor/operator.py

@@ -107,7 +107,7 @@ def _set_color_balance_settings(self, node: CompositorNodeColorBalance
                    NTPNodeSetting("gamma", ST.COLOR, min_version_=(3, 5, 0)),
                    NTPNodeSetting("lift",  ST.VEC3,  max_version_=(3, 5, 0)),
                    NTPNodeSetting("lift",  ST.COLOR, min_version_=(3, 5, 0))]
-        else:
+        elif node.correction_method == 'OFFSET_POWER_SLOPE':
             lst = [NTPNodeSetting("correction_method", ST.ENUM),
                    NTPNodeSetting("offset", ST.VEC3,  max_version_=(3, 5, 0)),
                    NTPNodeSetting("offset", ST.COLOR, min_version_=(3, 5, 0)),
@@ -116,6 +116,17 @@ def _set_color_balance_settings(self, node: CompositorNodeColorBalance
                    NTPNodeSetting("power", ST.COLOR, min_version_=(3, 5, 0)),
                    NTPNodeSetting("slope", ST.VEC3,  max_version_=(3, 5, 0)),
                    NTPNodeSetting("slope", ST.COLOR, min_version_=(3, 5, 0))]
+        elif node.correction_method == 'WHITEPOINT':
+            lst = [NTPNodeSetting("correction_method", ST.ENUM),
+                   NTPNodeSetting("input_temperature", ST.FLOAT),
+                   NTPNodeSetting("input_tint", ST.FLOAT),
+                   NTPNodeSetting("output_temperature", ST.FLOAT),
+                   NTPNodeSetting("output_tint", ST.FLOAT)]
+        else:
+            self.report({'ERROR'},
+                        f"Unknown color balance correction method "
+                        f"{enum_to_py_str(node.correction_method)}")
+            return
 
         color_balance_info = self._node_infos['CompositorNodeColorBalance']
         self._node_infos['CompositorNodeColorBalance'] = color_balance_info._replace(attributes_ = lst)

NodeToPython/geometry/node_tree.py

@@ -1,18 +1,24 @@
 import bpy
-from bpy.types import GeometryNodeTree
+from bpy.types import GeometryNodeTree, GeometryNode
 
 if bpy.app.version >= (3, 6, 0):
     from bpy.types import GeometryNodeSimulationInput
 
-if bpy.app.version > (4, 0, 0):
+if bpy.app.version >= (4, 0, 0):
     from bpy.types import GeometryNodeRepeatInput
 
+if bpy.app.version >= (4, 3, 0):
+    from bpy.types import GeometryNodeForeachGeometryElementInput
+
 from ..ntp_node_tree import NTP_NodeTree
 
 class NTP_GeoNodeTree(NTP_NodeTree):
     def __init__(self, node_tree: GeometryNodeTree, var: str):
         super().__init__(node_tree, var)
+        self.zone_inputs: dict[list[GeometryNode]] = {}
         if bpy.app.version >= (3, 6, 0):
-            self.sim_inputs: list[GeometryNodeSimulationInput] = []
+            self.zone_inputs["GeometryNodeSimulationInput"] = []
         if bpy.app.version >= (4, 0, 0):
-            self.repeat_inputs: list[GeometryNodeRepeatInput] = []
+            self.zone_inputs["GeometryNodeRepeatInput"] = []
+        if bpy.app.version >= (4, 3, 0):
+            self.zone_inputs["GeometryNodeForeachGeometryElementInput"] = []

NodeToPython/geometry/operator.py

@@ -49,16 +49,12 @@ 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 == 'GeometryNodeSimulationInput':
-            ntp_nt.sim_inputs.append(node)
-
-        elif node.bl_idname == 'GeometryNodeRepeatInput':
-            ntp_nt.repeat_inputs.append(node)
+        if node.bl_idname in ntp_nt.zone_inputs:
+            ntp_nt.zone_inputs[node.bl_idname].append(node)
 
         self._hide_hidden_sockets(node)
 
-        if node.bl_idname not in {'GeometryNodeSimulationInput', 
-                                  'GeometryNodeRepeatInput'}:
+        if node.bl_idname not in ntp_nt.zone_inputs:
             self._set_socket_defaults(node)
 
     if bpy.app.version >= (3, 6, 0):
@@ -139,10 +135,8 @@ def _process_node_tree(self, node_tree: GeometryNodeTree) -> None:
         for node in node_tree.nodes:
             self._process_node(node, ntp_nt)
 
-        if bpy.app.version >= (3, 6, 0):
-            self._process_zones(ntp_nt.sim_inputs)
-        if bpy.app.version >= (4, 0, 0):
-            self._process_zones(ntp_nt.repeat_inputs)
+        for zone_list in ntp_nt.zone_inputs.values():
+            self._process_zones(zone_list)
 
         #set look of nodes
         self._set_parents(node_tree)