razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fix crush on showing snapshot in flipbook

Browse source
This commit is contained in:
shun-iwasawa 2021-10-15 15:01:03 +09:00 committed by manongjohn
parent 8940bd2bed
commit f8e8df4fa1
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toonz/sources/toonz/flipbook.cpp
View file

@ -786,8 +786,10 @@ void FlipBook::onButtonPressed(FlipConsole::EGadget button) {
TImageP clonedImg;
if (ri)
clonedImg = TRasterImageP(ri->getRaster()->clone());
else
else {
clonedImg = TToonzImageP(ti->getRaster()->clone(), ti->getSavebox());
clonedImg->setPalette(ti->getPalette());
}
TImageCache::instance()->add(QString("TnzCompareImg"), clonedImg);
break;
}

7
toonz/sources/toonzlib/imagepainter.cpp
View file

@ -268,9 +268,10 @@ void Painter::flushRasterImages(const TRect &loadbox, double compareX,
if ((TToonzImageP)refimg || (TRasterImageP)refimg) {
// draw left/up part of the screen...
TRasterP raux, rref;
if ((TToonzImageP)refimg)
rref = ((TToonzImageP)refimg)->getCMapped();
else
if ((TToonzImageP)refimg) {
rref = ((TToonzImageP)refimg)->getCMapped();
m_palette = refimg->getPalette();
} else
rref = ((TRasterImageP)refimg)->getRaster();
TRect rect = loadbox;