Skip to content

Commit 5523c79

Browse files
committed
fix: function name collision with exporting multiple objects of the same type
1 parent c0fa119 commit 5523c79

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

NodeToPython/export/compositor/exporter.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ def _initialize_node_tree(
112112
) -> None:
113113
nt_name = ntp_node_tree._node_tree.name
114114

115-
self._node_tree_info._func = f"{ntp_node_tree._var}_node_group"
115+
self._node_tree_info._func = self._operator._create_var(
116+
f"{ntp_node_tree._var}_node_group"
117+
)
116118
#initialize node group
117119
self._write(f"def {self._node_tree_info._func}("
118120
f"{NODE_TREE_NAMES}: dict[typing.Callable, str]):",

NodeToPython/export/geometry/exporter.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ def _initialize_node_tree(
8787
ntp_node_tree: NTP_NodeTree
8888
) -> None:
8989
nt_name = ntp_node_tree._node_tree.name
90-
self._node_tree_info._func = f"{ntp_node_tree._var}_node_group"
90+
self._node_tree_info._func = self._operator._create_var(
91+
f"{ntp_node_tree._var}_node_group"
92+
)
9193
#initialize node group
9294
self._write(f"def {self._node_tree_info._func}("
9395
f"{NODE_TREE_NAMES}: dict[typing.Callable, str]):",

NodeToPython/export/ntp_operator.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ def __init__(self, *args, **kwargs):
7878
for name in RESERVED_NAMES:
7979
self._used_vars[name] = 0
8080

81+
# Useful information about exported node trees
8182
self._node_trees: dict[bpy.types.NodeTree, NodeTreeInfo] = {}
8283

84+
# Number of objects we end up exporting
8385
self._num_objs: int = 0
8486

8587
# Generate socket default, min, and max values

NodeToPython/export/shader/exporter.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ def _create_obj(self):
5353
# NodeTreeExporter interface
5454
def _initialize_node_tree(self, ntp_node_tree: NTP_NodeTree) -> None:
5555
nt_name = ntp_node_tree._node_tree.name
56-
self._node_tree_info._func = f"{ntp_node_tree._var}_node_group"
56+
self._node_tree_info._func = self._operator._create_var(
57+
f"{ntp_node_tree._var}_node_group"
58+
)
5759
#initialize node group
5860
self._write(f"def {self._node_tree_info._func}("
5961
f"{NODE_TREE_NAMES}: dict[typing.Callable, str]):",

0 commit comments

Comments
 (0)