Skip to content

Commit 22ef121

Browse files
committed
Block canvas: remove undo_redo property
Pass it around.
1 parent 2ece94f commit 22ef121

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

addons/block_code/ui/block_canvas/block_canvas.gd

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ var zoom: float:
4040
get:
4141
return _window.scale.x
4242

43-
var _undo_redo: EditorUndoRedoManager
44-
4543
signal reconnect_block(block: Block)
4644
signal add_block_code
4745
signal open_scene
@@ -174,27 +172,26 @@ func load_tree(parent: Node, node: SerializedBlockTreeNode):
174172

175173

176174
func rebuild_block_trees(undo_redo):
177-
_undo_redo = undo_redo
178175
var block_trees_array = []
179176
for c in _window.get_children():
180-
block_trees_array.append(build_tree(c))
177+
block_trees_array.append(build_tree(c, undo_redo))
181178
undo_redo.add_undo_property(_current_bsd.block_trees, "array", _current_bsd.block_trees.array)
182179
undo_redo.add_do_property(_current_bsd.block_trees, "array", block_trees_array)
183180

184181

185-
func build_tree(block: Block) -> SerializedBlockTreeNode:
182+
func build_tree(block: Block, undo_redo: EditorUndoRedoManager) -> SerializedBlockTreeNode:
186183
var path_child_pairs = []
187-
block.update_resources(_undo_redo)
184+
block.update_resources(undo_redo)
188185

189186
for snap in find_snaps(block):
190187
var snapped_block = snap.get_snapped_block()
191188
if snapped_block == null:
192189
continue
193-
path_child_pairs.append([block.get_path_to(snap), build_tree(snapped_block)])
190+
path_child_pairs.append([block.get_path_to(snap), build_tree(snapped_block, undo_redo)])
194191

195192
if block.resource.path_child_pairs != path_child_pairs:
196-
_undo_redo.add_undo_property(block.resource, "path_child_pairs", block.resource.path_child_pairs)
197-
_undo_redo.add_do_property(block.resource, "path_child_pairs", path_child_pairs)
193+
undo_redo.add_undo_property(block.resource, "path_child_pairs", block.resource.path_child_pairs)
194+
undo_redo.add_do_property(block.resource, "path_child_pairs", path_child_pairs)
198195

199196
return block.resource
200197

0 commit comments

Comments
 (0)