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

Duplicate links when we duplicate a layer

Browse Source
This commit is contained in:
David Capello 2015-01-22 09:49:01 -03:00
parent ca75dec911
commit 5258f8d4d7
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/document.cpp
View File

@ -44,6 +44,8 @@
#include "doc/palette.h"
#include "doc/sprite.h"
#include <map>
namespace app {
using namespace base;
@ -364,6 +366,8 @@ void Document::copyLayerContent(const Layer* sourceLayer0, Document* destDoc, La
CelConstIterator it = sourceLayer->getCelBegin();
CelConstIterator end = sourceLayer->getCelEnd();
std::map<ObjectId, ImageRef> linkedImages;
for (; it != end; ++it) {
const Cel* sourceCel = *it;
if (sourceCel->frame() > destLayer->sprite()->lastFrame())
@ -374,8 +378,15 @@ void Document::copyLayerContent(const Layer* sourceLayer0, Document* destDoc, La
const Image* sourceImage = sourceCel->image();
ASSERT(sourceImage != NULL);
ImageRef newImage(Image::createCopy(sourceImage));
newCel->setImage(newImage);
auto it = linkedImages.find(sourceImage->id());
if (it != linkedImages.end()) {
newCel->setImage(it->second);
}
else {
ImageRef newImage(Image::createCopy(sourceImage));
newCel->setImage(newImage);
linkedImages.insert(std::make_pair(sourceImage->id(), newImage));
}
destLayer->addCel(newCel);
newCel.release();