mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-29 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Fix crash undoing Sprite:newCel() in background layers

Browse Source
This commit is contained in:
David Capello 2020-07-22 14:19:11 -03:00
parent 0c194adef6
commit 4dfed179fb
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/app/script/sprite_class.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2018-2019 Igara Studio S.A.
// Copyright (C) 2018-2020 Igara Studio S.A.
// Copyright (C) 2015-2018 David Capello
//
// This program is distributed under the terms of
@ -14,6 +14,7 @@
#include "app/cmd/assign_color_profile.h"
#include "app/cmd/clear_cel.h"
#include "app/cmd/convert_color_profile.h"
#include "app/cmd/copy_region.h"
#include "app/cmd/flatten_layers.h"
#include "app/cmd/remove_layer.h"
#include "app/cmd/remove_slice.h"
@ -444,30 +445,46 @@ int Sprite_newCel(lua_State* L)
if (frame < 0 || frame > sprite->lastFrame())
return luaL_error(L, "frame index out of bounds %d", frame+1);
Doc* doc = static_cast<Doc*>(sprite->document());
LayerImage* layer = static_cast<LayerImage*>(layerBase);
ImageRef image(nullptr);
gfx::Point pos(0, 0);
Image* srcImage = may_get_image_from_arg(L, 4);
if (srcImage) {
image.reset(Image::createCopy(srcImage));
pos = convert_args_into_point(L, 5);
}
else {
image.reset(Image::create(sprite->spec()));
}
gfx::Point pos = convert_args_into_point(L, 5);
Cel* cel = nullptr;
auto cel = new Cel(frame, image);
cel->setPosition(pos);
// For background layers we just draw the image in the existent cel
if (layer->isBackground()) {
cel = layer->cel(frame);
ASSERT(cel);
Doc* doc = static_cast<Doc*>(sprite->document());
Tx tx;
DocApi api = doc->getApi(tx);
if (layer->cel(frame))
Tx tx;
DocApi api = doc->getApi(tx);
api.clearCel(layer, frame);
api.addCel(layer, cel);
tx.commit();
if (srcImage) {
tx(new cmd::CopyRegion(cel->image(), srcImage,
gfx::Region(srcImage->bounds()),
pos, false));
}
tx.commit();
}
// For transparent layers we just draw the image in the existent cel
else {
if (srcImage)
image.reset(Image::createCopy(srcImage));
else
image.reset(Image::create(sprite->spec()));
cel = new Cel(frame, image);
cel->setPosition(pos);
Tx tx;
DocApi api = doc->getApi(tx);
if (layer->cel(frame))
api.clearCel(layer, frame);
api.addCel(layer, cel);
tx.commit();
}
push_docobj(L, cel);
return 1;