[Bf-blender-cvs] [34c1319] master: Cleanup: use const for event->tablet_data

[Campbell Barton]

Commit: 34c1319d06f691aa8cabcc34a52d406ce99b682e
Author: Campbell Barton
Date:   Thu Apr 16 01:07:54 2015 +1000
Branches: master
https://developer.blender.org/rB34c1319d06f691aa8cabcc34a52d406ce99b682e

Cleanup: use const for event->tablet_data

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

M       source/blender/editors/gpencil/gpencil_paint.c
M       source/blender/windowmanager/WM_types.h
M       source/blender/windowmanager/intern/wm_event_system.c

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

diff --git a/source/blender/editors/gpencil/gpencil_paint.c 
b/source/blender/editors/gpencil/gpencil_paint.c
index 2795c82..778f98d 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1608,7 +1608,7 @@ static void gpencil_draw_apply_event(wmOperator *op, 
const wmEvent *event)
        
        /* handle pressure sensitivity (which is supplied by tablets) */
        if (event->tablet_data) {
-               wmTabletData *wmtab = event->tablet_data;
+               const wmTabletData *wmtab = event->tablet_data;
                
                tablet = (wmtab->Active != EVT_TABLET_NONE);
                p->pressure = wmtab->Pressure;
diff --git a/source/blender/windowmanager/WM_types.h 
b/source/blender/windowmanager/WM_types.h
index e716cd6..ecc7a82 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -453,7 +453,7 @@ typedef struct wmEvent {
        const char *keymap_idname;
 
        /* tablet info, only use when the tablet is active */
-       struct wmTabletData *tablet_data;
+       const struct wmTabletData *tablet_data;
 
        /* custom data */
        short custom;           /* custom data type, stylus, 6dof, see 
wm_event_types.h */
diff --git a/source/blender/windowmanager/intern/wm_event_system.c 
b/source/blender/windowmanager/intern/wm_event_system.c
index d8ca80a..2280782 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -123,7 +123,7 @@ void wm_event_free(wmEvent *event)
        }
 
        if (event->tablet_data) {
-               MEM_freeN(event->tablet_data);
+               MEM_freeN((void *)event->tablet_data);
        }
 
        MEM_freeN(event);
@@ -3504,7 +3504,7 @@ float WM_event_tablet_data(const wmEvent *event, int 
*pen_flip, float tilt[2])
                zero_v2(tilt);
 
        if (event->tablet_data) {
-               wmTabletData *wmtab = event->tablet_data;
+               const wmTabletData *wmtab = event->tablet_data;
 
                erasor = (wmtab->Active == EVT_TABLET_ERASER);
                if (wmtab->Active != EVT_TABLET_NONE) {

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