From 695ef9477a6de514b51317ccd3c7f3f770f24644 Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Aug 26 2023 14:51:25 +0000 Subject: #assistants: tv: fix invalidate rect --- diff --git a/toonz/sources/tnztools/toonzvectorbrushtool.cpp b/toonz/sources/tnztools/toonzvectorbrushtool.cpp index e43bc29..b7eb5d6 100644 --- a/toonz/sources/tnztools/toonzvectorbrushtool.cpp +++ b/toonz/sources/tnztools/toonzvectorbrushtool.cpp @@ -810,6 +810,7 @@ void ToonzVectorBrushTool::inputSetBusy(bool busy) { if (!isJustCreatedSpline(vi.getPointer())) { m_isPrompting = true; + invalidate(); int ret = DVGui::MsgBox( QString("Are you sure you want to replace the motion path?"), QObject::tr("Yes"), QObject::tr("No"), 0 ); @@ -987,8 +988,13 @@ void ToonzVectorBrushTool::inputPaintTracks(const TTrackList &tracks) { m_brushPos = m_mousePos = track.current().position; invalidateRect += TRectD(m_brushPos - halfThick, m_brushPos + halfThick); - if (!invalidateRect.isEmpty()) - invalidate(invalidateRect.enlarge(2)); + if (!invalidateRect.isEmpty()) { + if (m_isPath) { + if (getViewer()) getViewer()->GLInvalidateRect(invalidateRect); + } else { + invalidate(invalidateRect.enlarge(2)); + } + } } //-------------------------------------------------------------------------------------------------- @@ -1473,24 +1479,8 @@ void ToonzVectorBrushTool::draw() { //-------------------------------------------------------------------------------------------------------------- void ToonzVectorBrushTool::onEnter() { - TImageP img = getImage(false); - m_minThick = m_thickness.getValue().first; m_maxThick = m_thickness.getValue().second; - - Application *app = getApplication(); - - m_styleId = app->getCurrentLevelStyleIndex(); - TColorStyle *cs = app->getCurrentLevelStyle(); - if (cs) { - TRasterStyleFx *rfx = cs->getRasterStyleFx(); - m_active = cs->isStrokeStyle() || (rfx && rfx->isInkStyle()); - m_currentColor = cs->getAverageColor(); - m_currentColor.m = 255; - } else { - m_currentColor = TPixel32::Black; - } - m_active = img; } //----------------------------------------------------------------------------------------------------------