OpenToonz - An open-source full-featured 2D animation creation software
C
#assistants: fix extra undo records
Ivan Mahoninb1543838e25e
diff --git a/toonz/sources/include/tools/assistant.h b/toonz/sources/include/tools/assistant.hindex 50c58406a..c2b23220c 100644--- a/toonz/sources/include/tools/assistant.h+++ b/toonz/sources/include/tools/assistant.h@@ -219,8 +219,8 @@ public:}void fixPoints();- void move(const TPointD &position);- void movePoint(const TStringId &name, const TPointD &position);+ bool move(const TPointD &position);+ bool movePoint(const TStringId &name, const TPointD &position);void setPointSelection(const TStringId &name, bool selected) const;void setAllPointsSelection(bool selected) const;diff --git a/toonz/sources/tnztools/assistant.cpp b/toonz/sources/tnztools/assistant.cppindex 50f3b9122..9cfb89dcd 100644--- a/toonz/sources/tnztools/assistant.cpp+++ b/toonz/sources/tnztools/assistant.cpp@@ -219,21 +219,28 @@ TAssistant::fixPoints()//----------------------------------------------------------------------------------------------------void+boolTAssistant::move(const TPointD &position) {TPointD d = position - getBasePoint().position;- for(TAssistantPointMap::iterator i = m_points.begin(); i != m_points.end(); ++i)- i->second.position += d;- fixPoints();+ if (d != TPointD()) {+ for(TAssistantPointMap::iterator i = m_points.begin(); i != m_points.end(); ++i)+ i->second.position += d;+ fixPoints();+ return true;+ }+ return false;}//----------------------------------------------------------------------------------------------------void+boolTAssistant::movePoint(const TStringId &name, const TPointD &position) {TAssistantPointMap::iterator i = m_points.find(name);- if (i != m_points.end())+ if (i != m_points.end() && i->second.position != position) {onMovePoint(i->second, position);+ return true;+ }+ return false;}//---------------------------------------------------------------------------------------------------diff --git a/toonz/sources/tnztools/editassistantstool.cpp b/toonz/sources/tnztools/editassistantstool.cppindex 763a64c11..588a927b4 100644--- a/toonz/sources/tnztools/editassistantstool.cpp+++ b/toonz/sources/tnztools/editassistantstool.cpp@@ -546,13 +546,13 @@ public:void leftButtonDrag(const TPointD &position, const TMouseEvent&) override {if (m_dragAllPoints) {- if (Closer closer = write(ModeAssistant, true))- m_writeAssistant->move( position + m_currentPointOffset );+ if (Closer closer = write(ModeAssistant))+ if (m_writeAssistant->move(position + m_currentPointOffset))+ touch();} else {- if (Closer closer = write(ModePoint, true))- m_writeAssistant->movePoint(- m_currentPointName,- position + m_currentPointOffset);+ if (Closer closer = write(ModePoint))+ if (m_writeAssistant->movePoint(m_currentPointName, position + m_currentPointOffset))+ touch();}m_currentPosition = position;getViewer()->GLInvalidateAll();@@ -560,13 +560,13 @@ public:void leftButtonUp(const TPointD &position, const TMouseEvent&) override {if (m_dragAllPoints) {- if (Closer closer = write(ModeAssistant, true))- m_writeAssistant->move( position + m_currentPointOffset );+ if (Closer closer = write(ModeAssistant))+ if (m_writeAssistant->move(position + m_currentPointOffset))+ touch();} else {- if (Closer closer = write(ModePoint, true))- m_writeAssistant->movePoint(- m_currentPointName,- position + m_currentPointOffset);+ if (Closer closer = write(ModePoint))+ if (m_writeAssistant->movePoint(m_currentPointName, position + m_currentPointOffset))+ touch();}apply();