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

List:       kde-commits
Subject:    [krita/tantsevov/T6224-watercolor] /: Merge master
From:       Grigory Tantsevov <null () kde ! org>
Date:       2017-07-24 18:27:52
Message-ID: E1dZi5A-0007LN-Ij () code ! kde ! org
[Download RAW message or body]

Git commit fda6f4333072cfe3ce21e9a8342d57e87a1cf325 by Grigory Tantsevov.
Committed on 24/07/2017 at 18:27.
Pushed by tantsevov into branch 'tantsevov/T6224-watercolor'.

Merge master

M  +8    -0    krita/data/paintoppresets/CMakeLists.txt
M  +45   -12   libs/image/brushengine/kis_paintop_settings.h
M  +18   -20   libs/ui/tool/kis_tool_freehand.h
M  +136  -46   libs/ui/tool/kis_tool_freehand_helper.cpp
M  +15   -5    libs/ui/tool/kis_tool_freehand_helper.h

https://commits.kde.org/krita/fda6f4333072cfe3ce21e9a8342d57e87a1cf325

diff --cc libs/ui/tool/kis_tool_freehand_helper.h
index 71db46874bb,dcf07292b50..1c541792c4d
--- a/libs/ui/tool/kis_tool_freehand_helper.h
+++ b/libs/ui/tool/kis_tool_freehand_helper.h
@@@ -66,14 -72,9 +72,14 @@@ public
                     KisStrokesFacade *strokesFacade,
                     KisNodeSP overrideNode = 0,
                     KisDefaultBoundsBaseSP bounds = 0);
-     void paint(KoPointerEvent *event);
+     void paintEvent(KoPointerEvent *event);
      void endPaint();
  
 +    void initPaintInContinuedStroke(KoPointerEvent *event,
 +                                    KoCanvasResourceManager *resourceManager,
 +                                    KisImageWSP image, KisNodeSP currentNode, \
KisDefaultBoundsBaseSP bounds = 0);  +    void endPaintInContinuedStroke();
 +
      const KisPaintOp* currentPaintOp() const;
      QPainterPath paintOpOutline(const QPointF &savedCursorPos,
                                  const KoPointerEvent *event,


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