mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-27 06:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DocumentApi::move/copyCel(): copy background cels instead of composite them

Browse Source
This commit is contained in:
David Capello 2014-09-17 11:47:37 -03:00
parent c4dd3f6f65
commit bd3fcd3fc6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/document_api.cpp
View File

@ -721,9 +721,13 @@ void DocumentApi::moveCel(
if (srcLayer == dstLayer) { if (srcLayer == dstLayer) {
if (dstLayer->isBackground()) { if (dstLayer->isBackground()) {
ASSERT(dstImage); ASSERT(dstImage);
if (dstImage) if (dstImage) {
int blend = (srcLayer->isBackground() ?
BLEND_MODE_COPY: BLEND_MODE_NORMAL);
composite_image(dstImage, srcImage, composite_image(dstImage, srcImage,
srcCel->x(), srcCel->y(), 255, BLEND_MODE_NORMAL); srcCel->x(), srcCel->y(), 255, blend);
}
clearImage(srcImage, bgColor(srcLayer)); clearImage(srcImage, bgColor(srcLayer));
} }
@ -785,9 +789,13 @@ void DocumentApi::copyCel(
if (dstLayer->isBackground()) { if (dstLayer->isBackground()) {
if (srcCel) { if (srcCel) {
ASSERT(dstImage); ASSERT(dstImage);
if (dstImage) if (dstImage) {
int blend = (srcLayer->isBackground() ?
BLEND_MODE_COPY: BLEND_MODE_NORMAL);
composite_image(dstImage, srcImage, composite_image(dstImage, srcImage,
srcCel->x(), srcCel->y(), 255, BLEND_MODE_NORMAL); srcCel->x(), srcCel->y(), 255, blend);
}
} }
} }
else { else {