[Bf-blender-cvs] [2046817c080] master: WM: minor changes to cursor API

[Campbell Barton]

Commit: 2046817c080340d45c4297d2be9799df551b0805
Author: Campbell Barton
Date:   Thu Oct 25 15:18:24 2018 +1100
Branches: master
https://developer.blender.org/rB2046817c080340d45c4297d2be9799df551b0805

WM: minor changes to cursor API

===================================================================

M       source/blender/windowmanager/WM_api.h
M       source/blender/windowmanager/intern/wm_operators.c

===================================================================

diff --git a/source/blender/windowmanager/WM_api.h 
b/source/blender/windowmanager/WM_api.h
index 2ff416c0ba6..5ee7763272b 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -55,6 +55,7 @@ struct wmGesture;
 struct wmJob;
 struct wmOperatorType;
 struct wmOperator;
+struct wmPaintCursor;
 struct rcti;
 struct PointerRNA;
 struct PropertyRNA;
@@ -133,15 +134,17 @@ void              WM_cursor_grab_enable(struct wmWindow 
*win, bool wrap, bool hide, int boun
 void           WM_cursor_grab_disable(struct wmWindow *win, const int 
mouse_ungrab_xy[2]);
 void           WM_cursor_time          (struct wmWindow *win, int nr);
 
-void *WM_paint_cursor_activate(
+struct wmPaintCursor *WM_paint_cursor_activate(
         struct wmWindowManager *wm,
         bool (*poll)(struct bContext *C),
         void (*draw)(struct bContext *C, int, int, void *customdata),
         void *customdata);
 
-void           WM_paint_cursor_end(struct wmWindowManager *wm, void *handle);
+bool           WM_paint_cursor_end(struct wmWindowManager *wm, struct 
wmPaintCursor *handle);
+void       *WM_paint_cursor_customdata_get(struct wmPaintCursor *pc);
 void           WM_paint_cursor_tag_redraw(struct wmWindow *win, struct ARegion 
*ar);
 
+
 void           WM_cursor_warp          (struct wmWindow *win, int x, int y);
 void           WM_cursor_compatible_xy(wmWindow *win, int *x, int *y);
 float          WM_cursor_pressure      (const struct wmWindow *win);
diff --git a/source/blender/windowmanager/intern/wm_operators.c 
b/source/blender/windowmanager/intern/wm_operators.c
index 45084980727..2008d388ad3 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1813,7 +1813,7 @@ static void WM_OT_console_toggle(wmOperatorType *ot)
  * - draw(bContext): drawing callback for paint cursor
  */
 
-void *WM_paint_cursor_activate(
+wmPaintCursor *WM_paint_cursor_activate(
         wmWindowManager *wm, bool (*poll)(bContext *C),
         wmPaintCursorDraw draw, void *customdata)
 {
@@ -1828,7 +1828,7 @@ void *WM_paint_cursor_activate(
        return pc;
 }
 
-void WM_paint_cursor_end(wmWindowManager *wm, void *handle)
+bool WM_paint_cursor_end(wmWindowManager *wm, wmPaintCursor *handle)
 {
        wmPaintCursor *pc;
 
@@ -1836,9 +1836,15 @@ void WM_paint_cursor_end(wmWindowManager *wm, void 
*handle)
                if (pc == (wmPaintCursor *)handle) {
                        BLI_remlink(&wm->paintcursors, pc);
                        MEM_freeN(pc);
-                       return;
+                       return true;
                }
        }
+       return false;
+}
+
+void *WM_paint_cursor_customdata_get(wmPaintCursor *pc)
+{
+       return pc->customdata;
 }
 
 /* *********************** radial control ****************** */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs