Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix undoing "Move tiles" TileMapLayer action when drag/drop areas overlap #96844

Conversation

kleonc
Copy link
Member

@kleonc kleonc commented Sep 11, 2024

Fixes #96839.

(not sure about cherry-picking for 4.2 and earlier)

@kleonc kleonc added bug topic:editor topic:2d cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Sep 11, 2024
@kleonc kleonc added this to the 4.4 milestone Sep 11, 2024
@kleonc kleonc requested a review from groud September 11, 2024 08:48
Copy link
Member

@groud groud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't tested it, but it looks correct.

@akien-mga akien-mga merged commit 8613f34 into godotengine:master Sep 11, 2024
20 checks passed
@akien-mga
Copy link
Member

Thanks!

@kleonc kleonc deleted the tile_map_layer_fix_undoing_overlapping_move_tiles branch September 11, 2024 11:20
@akien-mga
Copy link
Member

Cherry-picked for 4.3.1.

@akien-mga akien-mga removed the cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release label Sep 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Undoing TileMapLayer cells movement results in deletion of overlapping cells "for good" (no option to redo)
3 participants