Browse Source

rename node_container_common to node_common

Joseph Brandenburg 3 tháng trước cách đây
mục cha
commit
8860af32ad
12 tập tin đã thay đổi với 14 bổ sung14 xóa
  1. 2 2
      base_definitions.py
  2. 1 1
      deformer_nodes.py
  3. 1 1
      internal_nodes.py
  4. 1 1
      link_nodes.py
  5. 1 1
      math_nodes.py
  6. 1 1
      misc_nodes.py
  7. 0 0
      node_common.py
  8. 1 1
      primitives_nodes.py
  9. 3 3
      readtree.py
  10. 1 1
      schema_nodes.py
  11. 1 1
      schema_solve.py
  12. 1 1
      xForm_nodes.py

+ 2 - 2
base_definitions.py

@@ -845,7 +845,7 @@ class MantisNode:
             conn.reset_execution_recursive()
     
     def evaluate_input(self, input_name, index=0)  -> Any:
-        from .node_container_common import trace_single_line
+        from .node_common import trace_single_line
         if not (self.inputs.get(input_name)): # get the named parameter if there is no input
             return self.parameters.get(input_name) # this will return None if the parameter does not exist.
         # this trace() should give a key error if there is a problem
@@ -856,7 +856,7 @@ class MantisNode:
     
     def fill_parameters(self, ui_node=None)  -> None:
         from .utilities import get_node_prototype
-        from .node_container_common import get_socket_value
+        from .node_common import get_socket_value
         if not ui_node:
             if ( (self.signature[0] in  ["MANTIS_AUTOGENERATED", "SCHEMA_AUTOGENERATED" ]) or 
                 (self.signature[-1] in ["NodeGroupOutput", "NodeGroupInput"]) ): # I think this is harmless

+ 1 - 1
deformer_nodes.py

@@ -1,4 +1,4 @@
-from .node_container_common import *
+from .node_common import *
 from .xForm_nodes import xFormGeometryObject, xFormObjectInstance
 from .misc_nodes import InputExistingGeometryObject
 from .base_definitions import MantisNode, MantisSocketTemplate

+ 1 - 1
internal_nodes.py

@@ -1,4 +1,4 @@
-from .node_container_common import *
+from .node_common import *
 from bpy.types import Node
 from .base_definitions import MantisNode
 from uuid import uuid4

+ 1 - 1
link_nodes.py

@@ -1,4 +1,4 @@
-from .node_container_common import *
+from .node_common import *
 from bpy.types import Bone, NodeTree
 from .base_definitions import MantisNode, GraphError, FLOAT_EPSILON
 from .link_socket_templates import *

+ 1 - 1
math_nodes.py

@@ -1,4 +1,4 @@
-from .node_container_common import *
+from .node_common import *
 from .base_definitions import MantisNode, NodeSocket
 
 def TellClasses():

+ 1 - 1
misc_nodes.py

@@ -1,4 +1,4 @@
-from .node_container_common import *
+from .node_common import *
 from .base_definitions import MantisNode, NodeSocket, FLOAT_EPSILON
 from .xForm_nodes import xFormArmature, xFormBone
 from .misc_nodes_socket_templates import *

+ 0 - 0
node_container_common.py → node_common.py


+ 1 - 1
primitives_nodes.py

@@ -1,4 +1,4 @@
-from .node_container_common import *
+from .node_common import *
 from .base_definitions import MantisNode, NodeSocket
 
 def TellClasses():

+ 3 - 3
readtree.py

@@ -124,7 +124,7 @@ def make_connections_to_ng_dummy(base_tree, tree_path_names, local_nc, all_nc, n
             #  using UUID signature leads to TERRIBLE CONFUSING BUGS.
             if nc_from is None: 
                 nc_from = autogen_node(base_tree, inp, signature, nc_to.mContext)
-            from .node_container_common import get_socket_value
+            from .node_common import get_socket_value
             if nc_from: # autogen can fail and we should catch it.
                 nc_from.parameters = {inp.name:get_socket_value(inp)}
                 local_nc[signature] = nc_from; all_nc[signature] = nc_from
@@ -487,7 +487,7 @@ def execution_error_cleanup(node, exception, switch_objects = [], show_error=Fal
 def sort_execution(nodes, xForm_pass):
     execution_failed=False
     sorted_nodes = []
-    from .node_container_common import GraphError
+    from .node_common import GraphError
     # check for cycles here by keeping track of the number of times a node has been visited.
     visited={}
     check_max_len=len(nodes)**2 # seems too high but safe. In a well-ordered graph, I guess this number should be less than the number of nodes.
@@ -542,7 +542,7 @@ def execute_tree(nodes, base_tree, context, error_popups = False):
                            " Mantis probably failed to parse the tree."
     import bpy
     from time import time
-    from .node_container_common import GraphError
+    from .node_common import GraphError
     original_active = context.view_layer.objects.active
     start_execution_time = time()
     mContext = None

+ 1 - 1
schema_nodes.py

@@ -1,4 +1,4 @@
-from .node_container_common import *
+from .node_common import *
 from math import pi, tau
 from .base_definitions import MantisNode, NodeSocket
 

+ 1 - 1
schema_solve.py

@@ -5,7 +5,7 @@ from .utilities import (prRed, prGreen, prPurple, prWhite,
 from .utilities import init_connections, init_dependencies, get_link_in_out
 from .base_definitions import (SchemaUINode, custom_props_types, \
     MantisNodeGroup, SchemaGroup, replace_types, GraphError)
-from .node_container_common import setup_custom_props_from_np
+from .node_common import setup_custom_props_from_np
 # a class that solves Schema nodes
 from bpy.types import NodeGroupInput, NodeGroupOutput
 

+ 1 - 1
xForm_nodes.py

@@ -1,4 +1,4 @@
-from .node_container_common import *
+from .node_common import *
 from .base_definitions import MantisNode, NodeSocket
 from .xForm_socket_templates import *