diff --git a/toonz/sources/include/toonzqt/flipconsole.h b/toonz/sources/include/toonzqt/flipconsole.h index 9474eb7..197cf04 100644 --- a/toonz/sources/include/toonzqt/flipconsole.h +++ b/toonz/sources/include/toonzqt/flipconsole.h @@ -203,9 +203,6 @@ public: eRate, eSound, eHisto, - eBlackBg, - eWhiteBg, - eCheckBg, eSaveImg, eCompare, eCustomize, @@ -220,6 +217,10 @@ public: eFlipHorizontal, eFlipVertical, eResetView, + // following values are hard-coded in ImagePainter + eBlackBg = 0x40000, + eWhiteBg = 0x80000, + eCheckBg = 0x100000, eEnd }; diff --git a/toonz/sources/toonz/iocommand.h b/toonz/sources/toonz/iocommand.h index 858643e..9053328 100644 --- a/toonz/sources/toonz/iocommand.h +++ b/toonz/sources/toonz/iocommand.h @@ -129,9 +129,6 @@ public: //! Multiple //! levels \a may be loaded for a single resource data. public: - /*- - * Resourceは常にLoadするように変更(ファイルをプロジェクトフォルダにコピー(=Import)したい場合は、ユーザが手動で行う) - * -*/ LoadResourceArguments() : row0(-1) , col0(-1)