Skip to content

Commit

Permalink
Fix the same frames being exported multiple times when "Selected fra…
Browse files Browse the repository at this point in the history
…mes" is selected, and multiple cels of the same frames are currently selected on the timeline - Fixes #1001
  • Loading branch information
OverloadedOrama committed Mar 30, 2024
1 parent fb95806 commit b0d4b30
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Built using Godot 3.5.2
- Optimize canvas drawing by only updating it when the image(s) have changed. [ac6a4db43d9296ebc03e639d8199dd3878a25d86](https://github.com/Orama-Interactive/Pixelorama/commit/ac6a4db43d9296ebc03e639d8199dd3878a25d86)
- Fix bug where using shortcuts to switch between frames also moved the selection, causing deletions.
- Pxo files can now be loaded from the Open menu option in the Web version. [3dcc51705a999145e53a8e6d4de217dc03b0f147](https://github.com/Orama-Interactive/Pixelorama/commit/3dcc51705a999145e53a8e6d4de217dc03b0f147)
- The same frames are no longer being exported multiple times when "Selected frames" is selected, and multiple cels of the same frames are currently selected on the timeline. [#1001](https://github.com/Orama-Interactive/Pixelorama/issues/1001)
- Fixed crash due to division by zero when locking two or three ValueSliders, and one of them has the value of 0 and the user attempts to change it.
- Fixed exporting selected layers not including the non-selected frames.
- Made the color picker not select fully transparent pixels that are not black. [#999](https://github.com/Orama-Interactive/Pixelorama/issues/999)
Expand Down
4 changes: 3 additions & 1 deletion src/Autoload/Export.gd
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ func calculate_frames(project := Global.current_project) -> Array:
frames = project.frames.slice(frame_start - 1, frame_end - 1, 1, true)
elif frame_current_tag == 1: # Selected frames
for cel in project.selected_cels:
frames.append(project.frames[cel[0]])
var frame: Frame = project.frames[cel[0]]
if not frames.has(frame):
frames.append(frame)
else: # All frames
frames = project.frames.duplicate()

Expand Down

0 comments on commit b0d4b30

Please sign in to comment.