mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-24 12:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable merge down for tilemaps (at least for the first version of tilemaps)

Browse Source
This commit is contained in:
David Capello 2019-11-06 12:32:47 -03:00
parent 53cabc3a1d
commit 962ad545ad
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/commands/cmd_merge_down_layer.cpp
View File

@ -57,11 +57,15 @@ bool MergeDownLayerCommand::onEnabled(Context* context)
return false; return false;
const Layer* src_layer = reader.layer(); const Layer* src_layer = reader.layer();
if (!src_layer || !src_layer->isImage()) if (!src_layer ||
!src_layer->isImage() ||
src_layer->isTilemap()) // TODO Add support to merge tilemaps (and groups!)
return false; return false;
const Layer* dst_layer = src_layer->getPrevious(); const Layer* dst_layer = src_layer->getPrevious();
if (!dst_layer || !dst_layer->isImage()) if (!dst_layer ||
!dst_layer->isImage() ||
dst_layer->isTilemap()) // TODO Add support to merge tilemaps
return false; return false;
return true; return true;
@ -72,10 +76,11 @@ void MergeDownLayerCommand::onExecute(Context* context)
ContextWriter writer(context); ContextWriter writer(context);
Doc* document(writer.document()); Doc* document(writer.document());
Sprite* sprite(writer.sprite()); Sprite* sprite(writer.sprite());
Tx tx(writer.context(), "Merge Down Layer", ModifyDocument);
LayerImage* src_layer = static_cast<LayerImage*>(writer.layer()); LayerImage* src_layer = static_cast<LayerImage*>(writer.layer());
Layer* dst_layer = src_layer->getPrevious(); Layer* dst_layer = src_layer->getPrevious();
Tx tx(writer.context(), friendlyName(), ModifyDocument);
for (frame_t frpos = 0; frpos<sprite->totalFrames(); ++frpos) { for (frame_t frpos = 0; frpos<sprite->totalFrames(); ++frpos) {
// Get frames // Get frames
Cel* src_cel = src_layer->cel(frpos); Cel* src_cel = src_layer->cel(frpos);