[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/krita-chili-kazakov] krita/plugins/tools/tool_transform2: Do not try to invert direction o
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2014-10-17 11:29:40
Message-ID: E1Xf5j2-0007RF-GK () scm ! kde ! org
[Download RAW message or body]

Git commit e536a95649a15a1a8153edd4da2b6fafdf951886 by Dmitry Kazakov.
Committed on 15/10/2014 at 09:37.
Pushed by dkazakov into branch 'krita-chili-kazakov'.

Do not try to invert direction of the Undo liquify brush

M  +4    -1    krita/plugins/tools/tool_transform2/kis_liquify_paintop.cpp
M  +1    -4    krita/plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp


http://commits.kde.org/calligra/e536a95649a15a1a8153edd4da2b6fafdf951886

diff --git a/krita/plugins/tools/tool_transform2/kis_liquify_paintop.cpp \
b/krita/plugins/tools/tool_transform2/kis_liquify_paintop.cpp index 7db89de..a1a2391 \
                100644
--- a/krita/plugins/tools/tool_transform2/kis_liquify_paintop.cpp
+++ b/krita/plugins/tools/tool_transform2/kis_liquify_paintop.cpp
@@ -108,7 +108,10 @@ KisSpacingInformation KisLiquifyPaintop::paintAt(const \
KisPaintInformation &pi)  
     const qreal spacing = m_d->props.spacing() * size;
 
-    const qreal reverseCoeff = m_d->props.reverseDirection() ? -1.0 : 1.0;
+    const qreal reverseCoeff =
+        m_d->props.currentMode() !=
+        ToolTransformArgs::LiquifyProperties::UNDO &&
+        m_d->props.reverseDirection() ? -1.0 : 1.0;
     const qreal amount = m_d->props.amountHasPressure() ?
         pi.pressure() * reverseCoeff * m_d->props.amount():
         reverseCoeff * m_d->props.amount();
diff --git a/krita/plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp \
b/krita/plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp index \
                f10fc04..0c2f5db 100644
--- a/krita/plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp
+++ b/krita/plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp
@@ -275,10 +275,7 @@ void KisToolTransformConfigWidget::updateLiquifyControls()
         static_cast<ToolTransformArgs::LiquifyProperties::LiquifyMode>(props->currentMode());
  
     bool canInverseDirection =
-        mode == ToolTransformArgs::LiquifyProperties::MOVE ||
-        mode == ToolTransformArgs::LiquifyProperties::SCALE ||
-        mode == ToolTransformArgs::LiquifyProperties::ROTATE ||
-        mode == ToolTransformArgs::LiquifyProperties::OFFSET;
+        mode != ToolTransformArgs::LiquifyProperties::UNDO;
 
     liquifyReverseDirectionChk->setEnabled(canInverseDirection);
 


[prev in list] [next in list] [prev in thread] [next in thread]