mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-16 05:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash copy & paste one frame in its previous frame position

Browse Source 
This should fix #1101 too.
This commit is contained in:
David Capello 2016-05-09 15:47:09 -03:00
parent 036cb8b523
commit 6a1a9556ae
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/util/clipboard.cpp
View File

@ -448,25 +448,40 @@ void paste()
case DocumentRange::kFrames: { case DocumentRange::kFrames: {
Transaction transaction(UIContext::instance(), "Paste Frames"); Transaction transaction(UIContext::instance(), "Paste Frames");
DocumentApi api = dstDoc->getApi(transaction); DocumentApi api = dstDoc->getApi(transaction);
frame_t dstFrame = frame_t(editor->frame() + 1); frame_t dstFrame = editor->frame();
if (srcSpr == dstSpr) {
if (srcRange.inRange(dstFrame))
dstFrame = srcRange.frameEnd()+1;
}
frame_t srcFrame = srcRange.frameBegin();
for (frame_t frame = srcRange.frameBegin(); frame <= srcRange.frameEnd(); ++frame) { for (frame_t frame = srcRange.frameBegin(); frame <= srcRange.frameEnd(); ++frame) {
api.addFrame(dstSpr, dstFrame); api.addEmptyFrame(dstSpr, dstFrame);
api.setFrameDuration(dstSpr, dstFrame, srcSpr->frameDuration(frame));
// If we are copying frames from/to the same sprite, we
// have to adjust the source frame.
if (srcSpr == dstSpr) {
if (dstFrame < srcFrame)
++srcFrame;
}
api.setFrameDuration(dstSpr, dstFrame, srcSpr->frameDuration(srcFrame));
for (LayerIndex for (LayerIndex
i = LayerIndex(srcLayers.size()-1), i = LayerIndex(srcLayers.size()-1),
j = LayerIndex(dstLayers.size()-1); j = LayerIndex(dstLayers.size()-1);
i >= LayerIndex(0) && i >= LayerIndex(0) &&
j >= LayerIndex(0); --i, --j) { j >= LayerIndex(0); --i, --j) {
Cel* cel = static_cast<LayerImage*>(srcLayers[i])->cel(frame); Cel* cel = static_cast<LayerImage*>(srcLayers[i])->cel(srcFrame);
if (cel && cel->image()) { if (cel && cel->image()) {
api.copyCel( api.copyCel(
static_cast<LayerImage*>(srcLayers[i]), frame, static_cast<LayerImage*>(srcLayers[i]), srcFrame,
static_cast<LayerImage*>(dstLayers[j]), dstFrame); static_cast<LayerImage*>(dstLayers[j]), dstFrame);
} }
} }
++srcFrame;
++dstFrame; ++dstFrame;
} }