Skip to content

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

C

fix undo

Abel You448baa62e2b2
diff --git a/toonz/sources/tnztools/geometrictool.cpp b/toonz/sources/tnztools/geometrictool.cpp
index 959d30683..ee37e9686 100644
--- a/toonz/sources/tnztools/geometrictool.cpp
+++ b/toonz/sources/tnztools/geometrictool.cpp
@@ -2840,6 +2840,12 @@ void MultiArcPrimitive::leftButtonDrag(const TPointD &pos,
TPointD newPos = calculateSnap(pos);
newPos = checkGuideSnapping(pos);
double dist = joinDistance * joinDistance;
+ static MultiArcPrimitiveUndo *undo;
+
+ if (m_clickNumber == 0) {
+ undo = new MultiArcPrimitiveUndo(this, m_stroke, m_strokeTemp, m_startPoint,
+ m_endPoint, m_centralPoint, m_clickNumber);
+ }
switch (m_clickNumber) {
case 0:
@@ -2850,7 +2856,7 @@ void MultiArcPrimitive::leftButtonDrag(const TPointD &pos,
break;
case 1:
- if (m_undoCount == 0) {
+ if (m_undoCount == 1) {
if (e.isShiftPressed())
m_endPoint = rectify(m_startPoint, pos);
else
@@ -2909,6 +2915,13 @@ void MultiArcPrimitive::leftButtonDrag(const TPointD &pos,
}
break;
}
+
+ if (m_undoCount == 0) {
+ undo->setRedoData(m_stroke, m_strokeTemp, m_startPoint, m_endPoint,
+ m_centralPoint, m_clickNumber);
+ TUndoManager::manager()->add(undo);
+ ++m_undoCount;
+ }
}
//-----------------------------------------------------------------------------