From f8e8df4fa100cc86d80735aa0336603982b6272b Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Fri, 15 Oct 2021 15:01:03 +0900 Subject: [PATCH] fix crush on showing snapshot in flipbook --- toonz/sources/toonz/flipbook.cpp | 4 +++- toonz/sources/toonzlib/imagepainter.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cpp index b0610432..3ab83cc4 100644 --- a/toonz/sources/toonz/flipbook.cpp +++ b/toonz/sources/toonz/flipbook.cpp @@ -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; } diff --git a/toonz/sources/toonzlib/imagepainter.cpp b/toonz/sources/toonzlib/imagepainter.cpp index d2ff6744..05d2746f 100644 --- a/toonz/sources/toonzlib/imagepainter.cpp +++ b/toonz/sources/toonzlib/imagepainter.cpp @@ -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;