diff --git a/toonz/sources/toonz/drawingdata.cpp b/toonz/sources/toonz/drawingdata.cpp index b621367..e3c9225 100644 --- a/toonz/sources/toonz/drawingdata.cpp +++ b/toonz/sources/toonz/drawingdata.cpp @@ -304,11 +304,10 @@ bool DrawingData::getLevelFrames(TXshSimpleLevel *sl, } // Merge Palette : - TPalette *slPlt = sl->getPalette(); - bool styleAdded = mergePalette_Overlap(slPlt, imgPlt, keepOriginalPalette); - + bool styleAdded = false; std::map styleTable; - if (slPlt) { + if (TPalette *slPlt = sl->getPalette()) { + styleAdded = mergePalette_Overlap(slPlt, imgPlt, keepOriginalPalette); for (int s = 0; s < slPlt->getStyleCount(); s++) styleTable[s] = s; }