diff --git a/toonz/sources/tnztools/CMakeLists.txt b/toonz/sources/tnztools/CMakeLists.txt index 2a3d441..9ca30f7 100644 --- a/toonz/sources/tnztools/CMakeLists.txt +++ b/toonz/sources/tnztools/CMakeLists.txt @@ -51,11 +51,11 @@ set(HEADERS ../include/tools/assistant.h ../include/tools/modifiers/modifierassistants.h ../include/tools/modifiers/modifierline.h - ../include/tools/modifiers/modifiertangents.h - ../include/tools/modifiers/modifiertest.h ../include/tools/modifiers/modifiersegmentation.h ../include/tools/modifiers/modifiersimplify.h ../include/tools/modifiers/modifiersmooth.h + ../include/tools/modifiers/modifiertangents.h + ../include/tools/modifiers/modifiertest.h ../include/tools/assistants/guidelineline.h ../include/tools/assistants/guidelineellipse.h ) @@ -128,11 +128,11 @@ set(SOURCES assistant.cpp modifiers/modifierassistants.cpp modifiers/modifierline.cpp - modifiers/modifiertangents.cpp - modifiers/modifiertest.cpp modifiers/modifiersegmentation.cpp modifiers/modifiersimplify.cpp modifiers/modifiersmooth.cpp + modifiers/modifiertangents.cpp + modifiers/modifiertest.cpp assistants/guidelineline.cpp assistants/guidelineellipse.cpp assistants/assistantvanishingpoint.cpp diff --git a/toonz/sources/tnztools/toonzvectorbrushtool.cpp b/toonz/sources/tnztools/toonzvectorbrushtool.cpp index dade32a..e43bc29 100644 --- a/toonz/sources/tnztools/toonzvectorbrushtool.cpp +++ b/toonz/sources/tnztools/toonzvectorbrushtool.cpp @@ -1060,7 +1060,8 @@ void ToonzVectorBrushTool::handleMouseEvent(MouseEventType type, TPointD snappedPos = pos; bool pickerMode = getViewer() && getViewer()->getGuidedStrokePickerMode(); - bool snapEnabled = !pickerMode && (alt != m_snap.getValue()); + bool snapInvert = alt && (!control || type == ME_MOVE || type == ME_DOWN); + bool snapEnabled = !pickerMode && (snapInvert != m_snap.getValue()); snap(pos, snapEnabled, m_active); if (m_snapped) snappedPos = m_snapPoint;