From a606a984c7f612e29f4396ce1f95f1c8e204a5d9 Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Aug 09 2023 05:10:40 +0000
Subject: #assistants: fix toonzrasterbrush


---

diff --git a/toonz/sources/tnztools/toonzrasterbrushtool.cpp b/toonz/sources/tnztools/toonzrasterbrushtool.cpp
index 2d30c40..61148f5 100644
--- a/toonz/sources/tnztools/toonzrasterbrushtool.cpp
+++ b/toonz/sources/tnztools/toonzrasterbrushtool.cpp
@@ -1406,7 +1406,8 @@ void ToonzRasterBrushTool::inputPaintTrackPoint(const TTrackPoint &point, const 
     
     // paint stroke
     m_painting.myPaint.strokeSegmentRect.empty();
-    handler->brush.strokeTo(point.position + rasCenter, point.pressure, point.tilt, point.time);
+    handler->brush.strokeTo( point.position + rasCenter, point.pressure,
+                             point.tilt, point.time - track.previous().time );
     if (lastPoint)
       handler->brush.endStroke();
     
@@ -1425,7 +1426,7 @@ void ToonzRasterBrushTool::inputPaintTrackPoint(const TTrackPoint &point, const 
     
     // Pencilモードでなく、Hardness=100 の場合のブラシサイズを1段階下げる
     double thickness = computeThickness(point.pressure, m_rasThickness)*2;
-    //if (!m_painting.pencil.realPencil && !m_painting.straight.isStraight)
+    //if (!m_painting.pencil.realPencil && !m_modifierLine->getManager())
     //  thickness -= 1.0;
     TThickPoint thickPoint(point.position + rasCenter, thickness);
 
@@ -1600,10 +1601,7 @@ void ToonzRasterBrushTool::inputMouseMove(const TPointD &position, const TInputS
 //-------------------------------------------------------------------------------------------------------------
 
 void ToonzRasterBrushTool::draw() {
-  if (m_painting.straight.isStraight) {
-    tglDrawSegment(m_painting.straight.firstPoint, m_painting.straight.lastPoint);
-    invalidate(TRectD(m_painting.straight.firstPoint, m_painting.straight.lastPoint).enlarge(2));
-  }
+  m_inputmanager.draw();
 
   /*--ショートカットでのツール切り替え時に赤点が描かれるのを防止する--*/
   if (m_minThick == 0 && m_maxThick == 0 &&
@@ -1647,8 +1645,6 @@ void ToonzRasterBrushTool::draw() {
     drawEmptyCircle(m_brushPos, tround(m_maxThick), true, true,
                     m_pencil.getValue());
   }
-  
-  m_inputmanager.draw();
 }
 
 //--------------------------------------------------------------------------------------------------------------
diff --git a/toonz/sources/tnztools/toonzrasterbrushtool.h b/toonz/sources/tnztools/toonzrasterbrushtool.h
index 4f6ef26..d2adfef 100644
--- a/toonz/sources/tnztools/toonzrasterbrushtool.h
+++ b/toonz/sources/tnztools/toonzrasterbrushtool.h
@@ -275,14 +275,6 @@ protected:
       mypaint::Brush baseBrush;
       TRect strokeSegmentRect;
     } myPaint;
-    
-    // straight variables
-    struct Straight {
-      bool isStraight = false;
-      TPointD firstPoint;
-      TPointD lastPoint;
-      double maxPressure = -1.0;
-    } straight;
   } m_painting;
   
   TPropertyGroup m_prop[2];