Skip to content

Commit 35dac58

Browse files
PiOverFourPiOverFour
committed
Improve newlines
1 parent 2b17ab8 commit 35dac58

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

‎NodeToPython/compositor/operator.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def _create_scene(self, indent_level: int):
5555
self._write(f"{SCENE}.name = {END_NAME}", indent_level)
5656
self._write(f"{SCENE}.use_fake_user = True", indent_level)
5757
self._write(f"bpy.context.window.scene = {SCENE}", indent_level)
58+
self._write("", 0)
5859

5960
def _initialize_compositor_node_tree(self, ntp_nt, nt_name):
6061
#initialize node group
@@ -63,6 +64,7 @@ def _initialize_compositor_node_tree(self, ntp_nt, nt_name):
6364

6465
if ntp_nt.node_tree == self._base_node_tree and self.is_scene:
6566
self._write(f"{ntp_nt.var} = {SCENE}.node_tree")
67+
self._write("", 0)
6668
self._write(f"# Start with a clean node tree")
6769
self._write(f"for {NODE} in {ntp_nt.var}.nodes:")
6870
self._write(f"{ntp_nt.var}.nodes.remove({NODE})", self._inner_indent_level + 1)
@@ -187,7 +189,7 @@ def _process_node_tree(self, node_tree: CompositorNodeTree):
187189
self._tree_interface_settings(ntp_nt)
188190

189191
#initialize nodes
190-
self._write(f"# Initialize {nt_var} nodes")
192+
self._write(f"# Initialize {nt_var} nodes\n")
191193

192194
for node in node_tree.nodes:
193195
self._process_node(node, ntp_nt)
@@ -201,6 +203,8 @@ def _process_node_tree(self, node_tree: CompositorNodeTree):
201203
self._init_links(node_tree)
202204

203205
self._write(f"return {nt_var}\n")
206+
if self._mode == 'SCRIPT':
207+
self._write("", 0)
204208

205209
#create node group
206210
self._write(f"{nt_var} = {nt_var}_node_group()\n", self._outer_indent_level)
@@ -249,6 +253,7 @@ def execute(self, context):
249253
self._create_scene(2)
250254
elif self._mode == 'SCRIPT':
251255
self._create_scene(0)
256+
self._write("", 0)
252257

253258
node_trees_to_process = self._topological_sort(self._base_node_tree)
254259

‎NodeToPython/geometry/operator.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ def _process_zones(self, zone_inputs: list[GeometryNode]) -> None:
7878
#must set defaults after paired with output
7979
self._set_socket_defaults(zone_input)
8080
self._set_socket_defaults(zone_output)
81-
self._write("", 0)
81+
82+
if zone_inputs:
83+
self._write("", 0)
8284

8385
if bpy.app.version >= (4, 0, 0):
8486
def _set_geo_tree_properties(self, node_tree: GeometryNodeTree) -> None:
@@ -119,8 +121,8 @@ def _process_node_tree(self, node_tree: GeometryNodeTree) -> None:
119121
self._write(f"def {nt_var}_node_group():", self._outer_indent_level)
120122
self._write(f'"""Initialize {nt_var} node group"""')
121123
self._write(f"{nt_var} = bpy.data.node_groups.new("
122-
f"type = \'GeometryNodeTree\', "
123-
f"name = {str_to_py_str(node_tree.name)})\n")
124+
f"type=\'GeometryNodeTree\', "
125+
f"name={str_to_py_str(node_tree.name)})\n")
124126

125127
self._set_node_tree_properties(node_tree)
126128
if bpy.app.version >= (4, 0, 0):
@@ -147,7 +149,7 @@ def _process_node_tree(self, node_tree: GeometryNodeTree) -> None:
147149
#create connections
148150
self._init_links(node_tree)
149151

150-
self._write(f"return {nt_var}\n")
152+
self._write(f"return {nt_var}\n\n")
151153

152154
#create node group
153155
self._write(f"{nt_var} = {nt_var}_node_group()\n", self._outer_indent_level)

‎NodeToPython/ntp_operator.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -669,8 +669,8 @@ def _create_socket(self, socket: NodeTreeInterfaceSocket,
669669

670670
self._write(f"{socket_var} = "
671671
f"{ntp_nt.var}.interface.new_socket("
672-
f"name = {name}, in_out={in_out_enum}, "
673-
f"socket_type = {socket_type}"
672+
f"name={name}, in_out={in_out_enum}, "
673+
f"socket_type={socket_type}"
674674
f"{optional_parent_str})")
675675

676676
self._set_tree_socket_defaults(socket, socket_var)
@@ -846,8 +846,6 @@ def _tree_interface_settings(self, ntp_nt: NTP_NodeTree) -> None:
846846

847847
self._process_items(None, panel_dict, items_processed, ntp_nt)
848848

849-
self._write("", 0)
850-
851849
def _set_input_defaults(self, node: Node) -> None:
852850
"""
853851
Sets defaults for input sockets
@@ -1420,7 +1418,8 @@ def _set_parents(self, node_tree: NodeTree) -> None:
14201418
node_var = self._node_vars[node]
14211419
parent_var = self._node_vars[node.parent]
14221420
self._write(f"{node_var}.parent = {parent_var}")
1423-
self._write("", 0)
1421+
if parent_comment:
1422+
self._write("", 0)
14241423

14251424
def _set_locations(self, node_tree: NodeTree) -> None:
14261425
"""
@@ -1435,7 +1434,8 @@ def _set_locations(self, node_tree: NodeTree) -> None:
14351434
node_var = self._node_vars[node]
14361435
self._write(f"{node_var}.location "
14371436
f"= ({node.location.x}, {node.location.y})")
1438-
self._write("", 0)
1437+
if node_tree.nodes:
1438+
self._write("", 0)
14391439

14401440
def _set_dimensions(self, node_tree: NodeTree) -> None:
14411441
"""
@@ -1452,7 +1452,8 @@ def _set_dimensions(self, node_tree: NodeTree) -> None:
14521452
node_var = self._node_vars[node]
14531453
self._write(f"{node_var}.width, {node_var}.height "
14541454
f"= {node.width}, {node.height}")
1455-
self._write("", 0)
1455+
if node_tree.nodes:
1456+
self._write("", 0)
14561457

14571458
def _init_links(self, node_tree: NodeTree) -> None:
14581459
"""
@@ -1504,6 +1505,7 @@ def _init_links(self, node_tree: NodeTree) -> None:
15041505
for _func in self._write_after_links:
15051506
_func()
15061507
self._write_after_links = []
1508+
self._write("", 0)
15071509

15081510

15091511
def _set_node_tree_properties(self, node_tree: NodeTree) -> None:
@@ -1517,7 +1519,6 @@ def _set_node_tree_properties(self, node_tree: NodeTree) -> None:
15171519
if bpy.app.version >= (4, 3, 0):
15181520
default_width = node_tree.default_group_node_width
15191521
self._write(f"{nt_var}.default_group_node_width = {default_width}")
1520-
self._write("\n")
15211522

15221523
def _hide_hidden_sockets(self, node: Node) -> None:
15231524
"""

‎NodeToPython/shader/operator.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self, *args, **kwargs):
3030
def _create_material(self, indent_level: int):
3131
self._write(f"{MAT_VAR} = bpy.data.materials.new("
3232
f"name = {str_to_py_str(self.material_name)})", indent_level)
33-
self._write(f"{MAT_VAR}.use_nodes = True", indent_level)
33+
self._write(f"{MAT_VAR}.use_nodes = True\n\n", indent_level)
3434

3535
def _initialize_shader_node_tree(self, ntp_node_tree: NTP_NodeTree,
3636
nt_name: str) -> None:
@@ -46,7 +46,7 @@ def _initialize_shader_node_tree(self, ntp_node_tree: NTP_NodeTree,
4646
self._write(f'"""Initialize {nt_name} node group"""')
4747

4848
if ntp_node_tree.node_tree == self._base_node_tree:
49-
self._write(f"{ntp_node_tree.var} = {MAT_VAR}.node_tree")
49+
self._write(f"{ntp_node_tree.var} = {MAT_VAR}.node_tree\n")
5050
self._write(f"# Start with a clean node tree")
5151
self._write(f"for {NODE} in {ntp_node_tree.var}.nodes:")
5252
self._write(f"{ntp_node_tree.var}.nodes.remove({NODE})", self._inner_indent_level + 1)
@@ -108,7 +108,7 @@ def _process_node_tree(self, node_tree: ShaderNodeTree) -> None:
108108
self._tree_interface_settings(ntp_nt)
109109

110110
#initialize nodes
111-
self._write(f"# Initialize {nt_var} nodes")
111+
self._write(f"# Initialize {nt_var} nodes\n")
112112

113113
for node in node_tree.nodes:
114114
self._process_node(node, ntp_nt)
@@ -121,7 +121,7 @@ def _process_node_tree(self, node_tree: ShaderNodeTree) -> None:
121121
#create connections
122122
self._init_links(node_tree)
123123

124-
self._write(f"return {nt_var}\n")
124+
self._write(f"return {nt_var}\n\n")
125125

126126
#create node group
127127
self._write(f"{nt_var} = {nt_var}_node_group()\n", self._outer_indent_level)

0 commit comments

Comments
 (0)