|
@@ -66,7 +66,6 @@ def clear_reroutes(links):
|
|
|
kept_links.append(new_link)
|
|
kept_links.append(new_link)
|
|
|
return kept_links
|
|
return kept_links
|
|
|
|
|
|
|
|
-
|
|
|
|
|
def tree_from_nc(sig, base_tree):
|
|
def tree_from_nc(sig, base_tree):
|
|
|
if (sig[0] == 'MANTIS_AUTOGENERATED'):
|
|
if (sig[0] == 'MANTIS_AUTOGENERATED'):
|
|
|
sig = sig[:-2] # cut off the end part of the signature (because it uses socket.name and socket.identifier)
|
|
sig = sig[:-2] # cut off the end part of the signature (because it uses socket.name and socket.identifier)
|
|
@@ -279,10 +278,10 @@ def schema_dependency_handle_item(schema, all_nc, item,):
|
|
|
if from_link.from_socket in from_name_filter:
|
|
if from_link.from_socket in from_name_filter:
|
|
|
hierarchy = False
|
|
hierarchy = False
|
|
|
# hierarchy_reason='b'
|
|
# hierarchy_reason='b'
|
|
|
- if from_link.from_node not in dependencies:
|
|
|
|
|
- if hierarchy:
|
|
|
|
|
- hierarchy_dependencies.append(from_link.from_node)
|
|
|
|
|
- dependencies.append(from_link.from_node)
|
|
|
|
|
|
|
+ if from_link.from_node not in dependencies:
|
|
|
|
|
+ if hierarchy:
|
|
|
|
|
+ hierarchy_dependencies.append(from_link.from_node)
|
|
|
|
|
+ dependencies.append(from_link.from_node)
|
|
|
if item.parent and item.parent.name == 'Constant':
|
|
if item.parent and item.parent.name == 'Constant':
|
|
|
if nc := all_nc.get((*schema.signature, 'SchemaConstInput')):
|
|
if nc := all_nc.get((*schema.signature, 'SchemaConstInput')):
|
|
|
for to_link in nc.outputs[item.name].links:
|
|
for to_link in nc.outputs[item.name].links:
|
|
@@ -293,10 +292,10 @@ def schema_dependency_handle_item(schema, all_nc, item,):
|
|
|
if from_link.from_socket in from_name_filter:
|
|
if from_link.from_socket in from_name_filter:
|
|
|
# hierarchy_reason='d'
|
|
# hierarchy_reason='d'
|
|
|
hierarchy = False
|
|
hierarchy = False
|
|
|
- if from_link.from_node not in dependencies:
|
|
|
|
|
- if hierarchy:
|
|
|
|
|
- hierarchy_dependencies.append(from_link.from_node)
|
|
|
|
|
- dependencies.append(from_link.from_node)
|
|
|
|
|
|
|
+ if from_link.from_node not in dependencies:
|
|
|
|
|
+ if hierarchy:
|
|
|
|
|
+ hierarchy_dependencies.append(from_link.from_node)
|
|
|
|
|
+ dependencies.append(from_link.from_node)
|
|
|
if item.parent and item.parent.name == 'Connection':
|
|
if item.parent and item.parent.name == 'Connection':
|
|
|
if nc := all_nc.get((*schema.signature, 'SchemaIncomingConnection')):
|
|
if nc := all_nc.get((*schema.signature, 'SchemaIncomingConnection')):
|
|
|
for to_link in nc.outputs[item.name].links:
|
|
for to_link in nc.outputs[item.name].links:
|
|
@@ -307,10 +306,10 @@ def schema_dependency_handle_item(schema, all_nc, item,):
|
|
|
if from_link.from_socket in from_name_filter:
|
|
if from_link.from_socket in from_name_filter:
|
|
|
# hierarchy_reason='f'
|
|
# hierarchy_reason='f'
|
|
|
hierarchy = False
|
|
hierarchy = False
|
|
|
- if from_link.from_node not in dependencies:
|
|
|
|
|
- if hierarchy:
|
|
|
|
|
- hierarchy_dependencies.append(from_link.from_node)
|
|
|
|
|
- dependencies.append(from_link.from_node)
|
|
|
|
|
|
|
+ if from_link.from_node not in dependencies:
|
|
|
|
|
+ if hierarchy:
|
|
|
|
|
+ hierarchy_dependencies.append(from_link.from_node)
|
|
|
|
|
+ dependencies.append(from_link.from_node)
|
|
|
|
|
|
|
|
def init_schema_dependencies(schema, all_nc, raise_errors=False):
|
|
def init_schema_dependencies(schema, all_nc, raise_errors=False):
|
|
|
""" Initialize the dependencies for Schema, and mark them as hierarchy or non-hierarchy dependencies
|
|
""" Initialize the dependencies for Schema, and mark them as hierarchy or non-hierarchy dependencies
|
