mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-21 03:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Add a warning message deleting objects that are not part of the sprite (fix #3135)

Browse Source 
Before this fix, the Sprite:deleteLayer/Slice/etc() Lua functions
didn't warn the user if its argument (a layer/slice/etc) didn't belong
to the corresponding sprite.
This commit is contained in:
Gaspar Capello 2022-01-19 10:25:05 -03:00 committed by David Capello
parent aec012a0d9
commit 653931c4fc
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2018-2021 Igara Studio S.A.
// Copyright (C) 2018-2022 Igara Studio S.A.
// Copyright (C) 2015-2018 David Capello
//
// This program is distributed under the terms of
@ -375,6 +375,8 @@ int Sprite_deleteLayer(lua_State* L)
}
}
if (layer) {
if (sprite != layer->sprite())
return luaL_error(L, "the layer doesn't belong to the sprite");
Tx tx;
tx(new cmd::RemoveLayer(layer));
tx.commit();
@ -501,11 +503,11 @@ int Sprite_newCel(lua_State* L)
int Sprite_deleteCel(lua_State* L)
{
auto sprite = get_docobj<Sprite>(L, 1);
(void)sprite; // unused
auto cel = may_get_docobj<doc::Cel>(L, 2);
if (!cel) {
if (auto layer = may_get_docobj<doc::Layer>(L, 2)) {
if (sprite != layer->sprite())
return luaL_error(L, "the layer doesn't belong to the sprite");
doc::frame_t frame = get_frame_number_from_arg(L, 3);
if (layer->isImage())
cel = static_cast<doc::LayerImage*>(layer)->cel(frame);
@ -548,6 +550,8 @@ int Sprite_deleteTag(lua_State* L)
tag = sprite->tags().getByName(tagName);
}
if (tag) {
if (sprite != tag->owner()->sprite())
return luaL_error(L, "the tag doesn't belong to the sprite");
Tx tx;
tx(new cmd::RemoveTag(sprite, tag));
tx.commit();
@ -582,6 +586,8 @@ int Sprite_deleteSlice(lua_State* L)
slice = sprite->slices().getByName(sliceName);
}
if (slice) {
if (sprite != slice->owner()->sprite())
return luaL_error(L, "the slice doesn't belong to the sprite");
Tx tx;
tx(new cmd::RemoveSlice(sprite, slice));
tx.commit();