Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

use current style color when drawing rotation preview

pojienie1e8e2f0b9341
diff --git a/toonz/sources/tnztools/geometrictool.cpp b/toonz/sources/tnztools/geometrictool.cpp
index 53468d6c3..a99b3249a 100644
--- a/toonz/sources/tnztools/geometrictool.cpp
+++ b/toonz/sources/tnztools/geometrictool.cpp
@@ -983,6 +983,7 @@ protected:
TStroke *m_rotatedStroke;
TPointD m_originalCursorPos;
TPointD m_currentCursorPos;
+ TPixel32 m_color;
// for rotation
double m_lastRotateAngle;
@@ -1243,6 +1244,7 @@ public:
void draw() override {
if (m_isRotatingOrMoving) {
+ tglColor(m_color);
drawStrokeCenterline(*m_rotatedStroke, sqrt(tglGetPixelSize2()));
return;
}
@@ -1359,6 +1361,20 @@ public:
m_lastMoveStrokePos = TPointD(0, 0);
m_wasCtrlPressed = false;
+ const TTool::Application *app = TTool::getApplication();
+ if (!app) {
+ m_color = TPixel32::Red;
+ return;
+ }
+
+ const TColorStyle *style = app->getCurrentLevelStyle();
+ if (!style) {
+ m_color = TPixel32::Red;
+ return;
+ }
+
+ m_color = style->getAverageColor();
+
return;
}
} else {