huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 01:29:49 +00:00
Code Issues Wiki Activity

Fix issue with frame moving and current_frame not changing

Browse source 
This bug actually originates from before the timeline remake and can be found in v0.6.2 and potentially earlier versions.
This commit is contained in:
OverloadedOrama 2020-03-06 22:44:48 +02:00
parent 9812a34b8b
commit 4969978f46
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Scripts/FrameButton.gd
View file

@ -126,6 +126,10 @@ func change_frame_order(rate : int) -> void:
Global.undo_redo.add_do_property(Global.canvases[frame], "frame", change) Global.undo_redo.add_do_property(Global.canvases[frame], "frame", change)
Global.undo_redo.add_do_property(Global.canvases[change], "frame", frame) Global.undo_redo.add_do_property(Global.canvases[change], "frame", frame)
if Global.current_frame == frame:
Global.undo_redo.add_do_property(Global, "current_frame", change)
Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame)
Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases) Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases)
Global.undo_redo.add_undo_property(Global.canvases[frame], "frame", frame) Global.undo_redo.add_undo_property(Global.canvases[frame], "frame", frame)
Global.undo_redo.add_undo_property(Global.canvases[change], "frame", change) Global.undo_redo.add_undo_property(Global.canvases[change], "frame", change)

1
Scripts/Global.gd
View file

@ -495,7 +495,6 @@ func canvases_changed(value : Array) -> void:
var frame_button = load("res://Prefabs/FrameButton.tscn").instance() var frame_button = load("res://Prefabs/FrameButton.tscn").instance()
frame_button.frame = j frame_button.frame = j
frame_button.layer = i frame_button.layer = i
frame_button.pressed = true
frame_button.get_child(0).texture = Global.canvases[j].layers[i][1] frame_button.get_child(0).texture = Global.canvases[j].layers[i][1]
layers[i][2].add_child(frame_button) layers[i][2].add_child(frame_button)