fix: bpy_prop_array import location change

BrendanParmer · Nov 17, 2024 · 4269432 · 4269432
1 parent 1a520d1
commit 4269432
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/NodeToPython/ntp_operator.py b/NodeToPython/ntp_operator.py
@@ -1,14 +1,18 @@
 import bpy
 from bpy.types import Context, Operator
 from bpy.types import Node, NodeTree
-from bpy_types import bpy_types
 
 if bpy.app.version < (4, 0, 0):
     from bpy.types import NodeSocketInterface
 else:
     from bpy.types import NodeTreeInterfacePanel, NodeTreeInterfaceSocket
     from bpy.types import NodeTreeInterfaceItem
 
+if bpy.app.version >= (4, 3, 0):
+    from bpy.types import bpy_prop_array
+else:
+    from bpy_types.bpy_types import bpy_prop_array
+
 import datetime
 import os
 import shutil
@@ -574,7 +578,7 @@ def _set_tree_socket_defaults(self, socket_interface: NodeTreeInterfaceSocket,
                 dv = vec4_to_py_str(dv)
             elif type(dv) in {mathutils.Vector, mathutils.Euler}:
                 dv = vec3_to_py_str(dv)
-            elif type(dv) == bpy_types.bpy_prop_array:
+            elif type(dv) == bpy_prop_array:
                 dv = array_to_py_str(dv)
             elif type(dv) == str:
                 dv = str_to_py_str(dv)

diff --git a/NodeToPython/utils.py b/NodeToPython/utils.py
@@ -1,7 +1,11 @@
 import bpy
-from bpy_types import bpy_types
 import mathutils
 
+if bpy.app.version >= (4, 3, 0):
+    from bpy.types import bpy_prop_array
+else:
+    from bpy_types.bpy_types import bpy_prop_array
+
 import keyword
 import re
 
@@ -106,7 +110,7 @@ def vec4_to_py_str(vec4) -> str:
     """
     return f"({vec4[0]}, {vec4[1]}, {vec4[2]}, {vec4[3]})"
 
-def array_to_py_str(array: bpy_types.bpy_prop_array) -> str:
+def array_to_py_str(array: bpy_prop_array) -> str:
     """
     Converts a bpy_prop_array into a string