OpenToonz - An open-source full-featured 2D animation creation software
C
fix palette bugs
shun-iwasawae818fe35883d
diff --git a/toonz/sources/toonz/filmstripcommand.cpp b/toonz/sources/toonz/filmstripcommand.cppindex 9f04e36b6..d1ddc76e5 100644--- a/toonz/sources/toonz/filmstripcommand.cpp+++ b/toonz/sources/toonz/filmstripcommand.cpp@@ -404,8 +404,11 @@ std::map<TFrameId, QString> clearFramesWithoutUndo("-" + QString::number(it->getNumber());TImageCache::instance()->add(id, sl->getFrame(frameId, false));clearedFrames[frameId] = id;+ // empty frame must be created BEFORE erasing frame or it may initialize+ // palette.+ TImageP emptyFrame = sl->createEmptyFrame();sl->eraseFrame(frameId);- sl->setFrame(*it, sl->createEmptyFrame());+ sl->setFrame(*it, emptyFrame);}invalidateIcons(sl.getPointer(), frames);TApp::instance()->getCurrentLevel()->notifyLevelChange();@@ -629,9 +632,9 @@ public:ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene();if (scene) {TCamera *camera = scene->getCurrentCamera();- TPointD dpi = camera->getDpi();- dpiX = dpi.x;- dpiY = dpi.y;+ TPointD dpi = camera->getDpi();+ dpiX = dpi.x;+ dpiY = dpi.y;} elsereturn;}diff --git a/toonz/sources/toonzlib/studiopalettecmd.cpp b/toonz/sources/toonzlib/studiopalettecmd.cppindex 452f41552..30628ca29 100644--- a/toonz/sources/toonzlib/studiopalettecmd.cpp+++ b/toonz/sources/toonzlib/studiopalettecmd.cpp@@ -591,7 +591,7 @@ void StudioPaletteCmd::mergeIntoCurrentPalette(TPaletteHandle *paletteHandle,TUndoManager::manager()->add(new PaletteAssignUndo(current, old, current->clone(), paletteHandle));- palette->setDirtyFlag(true);+ current->setDirtyFlag(true);paletteHandle->notifyPaletteChanged();}