OpenToonz - An open-source full-featured 2D animation creation software
C
cleanup
Abel You55bb4dd05f29
diff --git a/toonz/sources/toonz/colormodelviewer.cpp b/toonz/sources/toonz/colormodelviewer.cppindex b6037b63a..d8c0a45b5 100644--- a/toonz/sources/toonz/colormodelviewer.cpp+++ b/toonz/sources/toonz/colormodelviewer.cpp@@ -1,5 +1,3 @@-#include <Qdebug>-#include <qstack.h>// Tnz6 includes#include "colormodelviewer.h"@@ -451,7 +449,7 @@ void ColorModelViewer::changePickType() {return;}- else {//A a Temporary change, to always pick Lines and Areas+ else {std::string var = modeProp->getValueAsString();if (var == LINES) {m_mode = 1;diff --git a/toonz/sources/toonz/colormodelviewer.h b/toonz/sources/toonz/colormodelviewer.hindex 9739a665a..d730347b6 100644--- a/toonz/sources/toonz/colormodelviewer.h+++ b/toonz/sources/toonz/colormodelviewer.h@@ -17,7 +17,8 @@ class ColorModelViewer final : public FlipBook {/*-- ColorModelのファイルパスを覚えておいて、UseCurrentFrame間の移動に対応* --*/TFilePath m_currentRefImgPath;- /*-- Set m_mode to 2 after got m_mode --*/++ /*-- Set m_mode to 2 in changePickType after got m_mode if true && mode is AREA--*/bool m_alwaysPickLineStyle;QToolButton *pickLineStyles;@@ -62,7 +63,8 @@ protected slots:void updateViewer();/*-- * ツールのTypeに合わせてPickのタイプも変える。それにあわせカーソルも切り替える+ * ツールのTypeとm_alwaysPickLineStyleに合わせてPickのタイプも変える。+ * それにあわせカーソルも切り替える* -*/void changePickType();