Joseph Brandenburg 6 ماه پیش
والد
کامیت
af77a7fe23
6فایلهای تغییر یافته به همراه9 افزوده شده و 9 حذف شده
  1. 2 2
      __init__.py
  2. 3 3
      deformer_containers.py
  3. 0 0
      misc_nodes.py
  4. 1 1
      misc_nodes_ui.py
  5. 1 1
      readtree.py
  6. 2 2
      utilities.py

+ 2 - 2
__init__.py

@@ -3,7 +3,7 @@ from . import ( ops_nodegroup,
                 socket_definitions,
                 link_definitions,
                 xForm_definitions,
-                nodes_generic,
+                misc_nodes_ui,
                 primitives_definitions,
                 deformer_definitions,
                 math_definitions,
@@ -21,7 +21,7 @@ MANTIS_VERSION_SUB=5
 classLists = [module.TellClasses() for module in [
  link_definitions,
  xForm_definitions,
- nodes_generic,
+ misc_nodes_ui,
  socket_definitions,
  ops_nodegroup,
  primitives_definitions,

+ 3 - 3
deformer_containers.py

@@ -1,6 +1,6 @@
 from .node_container_common import *
 from .xForm_containers import xFormGeometryObject
-from .misc_containers import InputExistingGeometryObject
+from .misc_nodes import InputExistingGeometryObject
 from .base_definitions import MantisNode
 
 from .utilities import (prRed, prGreen, prPurple, prWhite, prOrange,
@@ -19,7 +19,7 @@ def TellClasses():
 
 def trace_xForm_back(nc, socket):
     from .xForm_containers import xFormGeometryObject
-    from .misc_containers import InputExistingGeometryObject
+    from .misc_nodes import InputExistingGeometryObject
     from bpy.types import Object
     if (trace := trace_single_line(nc, socket)[0] ) :
         for i in range(len(trace)): # have to look in reverse, actually
@@ -75,7 +75,7 @@ class DeformerArmature(MantisNode):
     # DEDUP HACK HACK HACK HACK HACK
     def bGetParentArmature(self):
         from .xForm_containers import xFormArmature
-        from .misc_containers import InputExistingGeometryObject
+        from .misc_nodes import InputExistingGeometryObject
         from bpy.types import Object
         if (trace := trace_single_line(self, "Armature Object")[0] ) :
             for i in range(len(trace)):

+ 0 - 0
misc_containers.py → misc_nodes.py


+ 1 - 1
nodes_generic.py → misc_nodes_ui.py

@@ -1004,5 +1004,5 @@ class UtilityPrint(Node, MantisUINode):
 
 # Set up the class property that ties the UI classes to the Mantis classes.
 for cls in TellClasses():
-    cls.mantis_node_library='.misc_containers'
+    cls.mantis_node_library='.misc_nodes'
     cls.set_mantis_class()

+ 1 - 1
readtree.py

@@ -309,7 +309,7 @@ def parse_tree(base_tree):
     
     start_time = time.time()
     roots, array_nodes = [], []
-    from .misc_containers import UtilityArrayGet
+    from .misc_nodes import UtilityArrayGet
     for mantis_node in all_mantis_nodes.values():
         if mantis_node.node_type in ["DUMMY"]: # clean up the groups
             if mantis_node.prototype.bl_idname in ("MantisNodeGroup", "NodeGroupOutput"):

+ 2 - 2
utilities.py

@@ -548,10 +548,10 @@ def project_point_to_plane(point, origin, normal):
 # This is really, really stupid way to do this
 def gen_nc_input_for_data(socket):
     # Class List #TODO deduplicate
-    from . import xForm_containers, link_containers, misc_containers, primitives_containers, deformer_containers, math_containers, schema_containers
+    from . import xForm_containers, link_containers, misc_nodes, primitives_containers, deformer_containers, math_containers, schema_containers
     from .internal_containers import NoOpNode
     classes = {}
-    for module in [xForm_containers, link_containers, misc_containers, primitives_containers, deformer_containers, math_containers, schema_containers]:
+    for module in [xForm_containers, link_containers, misc_nodes, primitives_containers, deformer_containers, math_containers, schema_containers]:
         for cls in module.TellClasses():
             classes[cls.__name__] = cls
     #