Skip to content

Commit b1aca57

Browse files
committed
Main panel: remove _current_bsd
And fix undo redo property to be the BlockCodeNode "block_script". The current BlockCodeNode has it already as the block_script property. Use that directly
1 parent 240038a commit b1aca57

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

addons/block_code/ui/main_panel.gd

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ var eia: EditorInterfaceAccess
1111
@onready var _editor_inspector: EditorInspector = EditorInterface.get_inspector()
1212

1313
var block_code_tab: Button
14-
var _current_bsd: BlockScriptData
1514
var _current_block_code_node: BlockCode
1615
var _scene_root: Node
1716
var _block_code_nodes: Array
@@ -40,30 +39,31 @@ func switch_scene(scene_root: Node):
4039

4140

4241
func switch_script(block_code_node: BlockCode):
43-
var bsd = block_code_node.block_script if block_code_node else null
44-
_current_bsd = bsd
42+
var block_script: BlockScriptData = block_code_node.block_script if block_code_node else null
4543
_current_block_code_node = block_code_node
46-
_picker.bsd_selected(bsd)
47-
_title_bar.bsd_selected(bsd)
48-
_block_canvas.bsd_selected(bsd)
44+
_picker.bsd_selected(block_script)
45+
_title_bar.bsd_selected(block_script)
46+
_block_canvas.bsd_selected(block_script)
4947
if block_code_node:
5048
block_code_tab.pressed.emit()
5149

5250

5351
func save_script():
54-
if _current_bsd == null:
52+
if _current_block_code_node == null:
5553
print("No script loaded to save.")
5654
return
5755

56+
var block_script: BlockScriptData = _current_block_code_node.block_script
57+
5858
undo_redo.create_action("Modify %s's block code script" % _current_block_code_node.get_parent().name)
59-
undo_redo.add_undo_property(_current_block_code_node, "bsd", _current_bsd)
59+
undo_redo.add_undo_property(_current_block_code_node, "block_script", block_script)
6060

6161
var block_trees := _block_canvas.get_canvas_block_trees()
62-
var generated_script = _block_canvas.generate_script_from_current_window(_current_bsd.script_inherits)
63-
_current_bsd.block_trees = block_trees
64-
_current_bsd.generated_script = generated_script
62+
var generated_script = _block_canvas.generate_script_from_current_window(block_script.script_inherits)
63+
block_script.block_trees = block_trees
64+
block_script.generated_script = generated_script
6565

66-
undo_redo.add_do_property(_current_block_code_node, "bsd", _current_bsd)
66+
undo_redo.add_do_property(_current_block_code_node, "block_script", block_script)
6767
undo_redo.commit_action()
6868

6969

@@ -81,8 +81,9 @@ func _input(event):
8181

8282

8383
func _print_generated_script():
84-
if _current_bsd == null:
84+
if _current_block_code_node == null:
8585
return
86-
var script: String = _block_canvas.generate_script_from_current_window(_current_bsd.script_inherits)
86+
var block_script: BlockScriptData = _current_block_code_node.block_script
87+
var script: String = _block_canvas.generate_script_from_current_window(block_script.script_inherits)
8788
print(script)
8889
print("Debug script! (not saved)")

0 commit comments

Comments
 (0)