diff --git a/core_lib/src/structure/layerbitmap.cpp b/core_lib/src/structure/layerbitmap.cpp index 2b93cfba4..a204ac148 100644 --- a/core_lib/src/structure/layerbitmap.cpp +++ b/core_lib/src/structure/layerbitmap.cpp @@ -49,12 +49,11 @@ void LayerBitmap::replaceLastBitmapAtFrame(const BitmapImage* replaceWithImage) *static_cast(getLastKeyFrameAtPosition(replaceWithImage->pos())) = *replaceWithImage; } -void LayerBitmap::putBitmapIntoFrame(KeyFrame* keyframe, int frameIndex) +void LayerBitmap::putBitmapIntoFrame(BitmapImage* bitmapImage, int frameIndex) { BitmapImage* currentBitmap = getBitmapImageAtFrame(frameIndex); - BitmapImage newBitmap = *static_cast(keyframe); - static_cast(currentBitmap)->paste(&newBitmap); + static_cast(currentBitmap)->paste(bitmapImage); } void LayerBitmap::repositionFrame(QPoint point, int frame) diff --git a/core_lib/src/structure/layerbitmap.h b/core_lib/src/structure/layerbitmap.h index 682dd4f56..bf1b7468e 100644 --- a/core_lib/src/structure/layerbitmap.h +++ b/core_lib/src/structure/layerbitmap.h @@ -37,7 +37,7 @@ class LayerBitmap : public Layer BitmapImage* getBitmapImageAtFrame(int frameNumber); BitmapImage* getLastBitmapImageAtFrame(int frameNumber, int increment = 0); void replaceLastBitmapAtFrame(const BitmapImage* replaceWithImage); - void putBitmapIntoFrame(KeyFrame* keyframe, int frameIndex); + void putBitmapIntoFrame(BitmapImage* bitmapImage, int frameIndex); void repositionFrame(QPoint point, int frame); QRect getFrameBounds(int frame); diff --git a/core_lib/src/structure/layervector.cpp b/core_lib/src/structure/layervector.cpp index 90bc948f8..b5231d8ba 100644 --- a/core_lib/src/structure/layervector.cpp +++ b/core_lib/src/structure/layervector.cpp @@ -200,11 +200,9 @@ void LayerVector::replaceLastVectorImageAtFrame(const VectorImage* replaceWithIm *static_cast(getLastKeyFrameAtPosition(replaceWithImage->pos())) = *replaceWithImage; } -void LayerVector::putVectorImageIntoFrame(VectorImage* keyframe, int frameIndex) +void LayerVector::putVectorImageIntoFrame(VectorImage* vectorImage, int frameIndex) { VectorImage* currentVectorImg = getVectorImageAtFrame(frameIndex); - - VectorImage newVectorImg = *static_cast(keyframe); - static_cast(currentVectorImg)->paste(newVectorImg); + static_cast(currentVectorImg)->paste(vectorImage); } diff --git a/core_lib/src/structure/layervector.h b/core_lib/src/structure/layervector.h index eeb8f3ba2..9a4215105 100644 --- a/core_lib/src/structure/layervector.h +++ b/core_lib/src/structure/layervector.h @@ -39,7 +39,7 @@ class LayerVector : public Layer VectorImage* getVectorImageAtFrame(int frameNumber) const; VectorImage* getLastVectorImageAtFrame(int frameNumber, int increment) const; void replaceLastVectorImageAtFrame(const VectorImage* replaceWithImage); - void putVectorImageIntoFrame(VectorImage* keyframe, int frameIndex); + void putVectorImageIntoFrame(VectorImage* vectorImage, int frameIndex); bool usesColor(int index); void removeColor(int index);