From 9e139b8a21f1394efca4623660ccf568cb70ce5b Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Dec 18 2018 06:49:56 +0000 Subject: reload psd level (#2415) --- diff --git a/toonz/sources/toonz/levelcommand.cpp b/toonz/sources/toonz/levelcommand.cpp index bb5344b..4ae2d12 100644 --- a/toonz/sources/toonz/levelcommand.cpp +++ b/toonz/sources/toonz/levelcommand.cpp @@ -358,14 +358,14 @@ void revertTo(bool isCleanedUp) { /*-- Revert可能なLevelタイプの条件 --*/ if ((isCleanedUp && type == TZP_XSHLEVEL) || (!isCleanedUp && (type == TZP_XSHLEVEL || type == PLI_XSHLEVEL || - (type == OVL_XSHLEVEL && ext != "psd")))) { + type == OVL_XSHLEVEL))) { levels.insert(level); selectionContainLevel = true; } } if (levels.empty() || !selectionContainLevel) { DVGui::error( - QObject::tr("The Revert to Last Saved command is not supported for " + QObject::tr("The Reload command is not supported for " "the current selection.")); return; } diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cpp index 33bc362..befe825 100644 --- a/toonz/sources/toonz/xshcellviewer.cpp +++ b/toonz/sources/toonz/xshcellviewer.cpp @@ -137,8 +137,7 @@ bool selectionContainLevelImage(TCellSelection *selection, TXsheet *xsheet) { std::string ext = level->getPath().getType(); int type = level->getType(); - if (type == TZP_XSHLEVEL || type == PLI_XSHLEVEL || - (type == OVL_XSHLEVEL && ext != "psd")) + if (type == TZP_XSHLEVEL || type == PLI_XSHLEVEL || type == OVL_XSHLEVEL) return true; }