rename cursor setting functions to make modal set/restore more clearly related functions.

diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c
index ec1662c7fa6a3afa5574b187e87c3114a3fa2bec..d0e1b15064a17ec1f95d50710fef622c5444ec84 100644 (file)
--- a/source/blender/editors/armature/pose_slide.c
+++ b/source/blender/editors/armature/pose_slide.c
@@ -602,7 +602,7 @@ static int pose_slide_invoke_common(bContext *C, wmOperator *op, tPoseSlideOp *p
        pose_slide_refresh(C, pso);
        
        /* set cursor to indicate modal */
-       WM_cursor_modal(win, BC_EW_SCROLLCURSOR);
+       WM_cursor_modal_set(win, BC_EW_SCROLLCURSOR);
        
        /* header print */
        pose_slide_draw_status(pso);
@@ -624,7 +624,7 @@ static int pose_slide_modal(bContext *C, wmOperator *op, const wmEvent *event)
                {
                        /* return to normal cursor and header status */
                        ED_area_headerprint(pso->sa, NULL);
-                       WM_cursor_restore(win);
+                       WM_cursor_modal_restore(win);
                        
                        /* insert keyframes as required... */
                        pose_slide_autoKeyframe(C, pso);
@@ -639,7 +639,7 @@ static int pose_slide_modal(bContext *C, wmOperator *op, const wmEvent *event)
                {
                        /* return to normal cursor and header status */
                        ED_area_headerprint(pso->sa, NULL);
-                       WM_cursor_restore(win);
+                       WM_cursor_modal_restore(win);
                        
                        /* reset transforms back to original state */
                        pose_slide_reset(pso);

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index da8325544436dd47812da76669a59fd830dc9564..255f0b7cfbae1f4750e08747fc15a58644af31ca 100644 (file)
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1431,7 +1431,7 @@ static void gpencil_draw_exit(bContext *C, wmOperator *op)
        gpencil_undo_finish();
        
        /* restore cursor to indicate end of drawing */
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
        
        /* don't assume that operator data exists at all */
        if (p) {
@@ -1764,9 +1764,9 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event
        
        /* set cursor */
        if (p->paintmode == GP_PAINTMODE_ERASER)
-               WM_cursor_modal(win, BC_CROSSCURSOR);  /* XXX need a better cursor */
+               WM_cursor_modal_set(win, BC_CROSSCURSOR);  /* XXX need a better cursor */
        else
-               WM_cursor_modal(win, BC_PAINTBRUSHCURSOR);
+               WM_cursor_modal_set(win, BC_PAINTBRUSHCURSOR);
        
        /* special hack: if there was an initial event, then we were invoked via a hotkey, and 
         * painting should start immediately. Otherwise, this was called from a toolbar, in which

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index dc7813510ecca4cf5d9d2530e05f36881c16d061..e20b55d95a955bf7e4ac757bb03de90ab15dfa22 100644 (file)
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1981,7 +1981,7 @@ static void ui_textedit_begin(bContext *C, uiBut *but, uiHandleButtonData *data)
 
        ui_check_but(but);
        
-       WM_cursor_modal(CTX_wm_window(C), BC_TEXTEDITCURSOR);
+       WM_cursor_modal_set(CTX_wm_window(C), BC_TEXTEDITCURSOR);
 }
 
 static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -2013,7 +2013,7 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
                but->pos = -1;
        }
        
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
 }
 
 static void ui_textedit_next_but(uiBlock *block, uiBut *actbut, uiHandleButtonData *data)

diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index cfe6e313c580a9ee2b48692d35de3671b2cc5b64..d714402de9f5d758cd9faa82f008f3e2864230d4 100644 (file)
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -118,7 +118,7 @@ static int eyedropper_init(bContext *C, wmOperator *op)
 
 static void eyedropper_exit(bContext *C, wmOperator *op)
 {
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
        
        if (op->customdata)
                MEM_freeN(op->customdata);
@@ -289,7 +289,7 @@ static int eyedropper_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(
 {
        /* init */
        if (eyedropper_init(C, op)) {
-               WM_cursor_modal(CTX_wm_window(C), BC_EYEDROPPER_CURSOR);
+               WM_cursor_modal_set(CTX_wm_window(C), BC_EYEDROPPER_CURSOR);
 
                /* add temp handler */
                WM_event_add_modal_handler(C, op);

diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index 3e9e16b285c1e3fa05f9fb2465464c71c49acb0e..03bd7e4631b96875a775b19ed9095abda87676b3 100644 (file)
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -219,11 +219,11 @@ static int view_pan_invoke(bContext *C, wmOperator *op, const wmEvent *event)
        RNA_int_set(op->ptr, "deltay", 0);
        
        if (v2d->keepofs & V2D_LOCKOFS_X)
-               WM_cursor_modal(window, BC_NS_SCROLLCURSOR);
+               WM_cursor_modal_set(window, BC_NS_SCROLLCURSOR);
        else if (v2d->keepofs & V2D_LOCKOFS_Y)
-               WM_cursor_modal(window, BC_EW_SCROLLCURSOR);
+               WM_cursor_modal_set(window, BC_EW_SCROLLCURSOR);
        else
-               WM_cursor_modal(window, BC_NSEW_SCROLLCURSOR);
+               WM_cursor_modal_set(window, BC_NSEW_SCROLLCURSOR);
        
        /* add temp handler */
        WM_event_add_modal_handler(C, op);
@@ -260,7 +260,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event)
                                RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty));
                                
                                view_pan_exit(op);
-                               WM_cursor_restore(CTX_wm_window(C));
+                               WM_cursor_modal_restore(CTX_wm_window(C));
                                WM_operator_name_call(C, "VIEW2D_OT_zoom", WM_OP_INVOKE_DEFAULT, NULL);
                                return OPERATOR_FINISHED;
                        }
@@ -273,7 +273,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event)
                                        RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty));
                                        
                                        view_pan_exit(op);
-                                       WM_cursor_restore(CTX_wm_window(C));
+                                       WM_cursor_modal_restore(CTX_wm_window(C));
                                        
                                        return OPERATOR_FINISHED;
                                }
@@ -987,11 +987,11 @@ static int view_zoomdrag_invoke(bContext *C, wmOperator *op, const wmEvent *even
        }
 
        if (v2d->keepofs & V2D_LOCKOFS_X)
-               WM_cursor_modal(window, BC_NS_SCROLLCURSOR);
+               WM_cursor_modal_set(window, BC_NS_SCROLLCURSOR);
        else if (v2d->keepofs & V2D_LOCKOFS_Y)
-               WM_cursor_modal(window, BC_EW_SCROLLCURSOR);
+               WM_cursor_modal_set(window, BC_EW_SCROLLCURSOR);
        else
-               WM_cursor_modal(window, BC_NSEW_SCROLLCURSOR);
+               WM_cursor_modal_set(window, BC_NSEW_SCROLLCURSOR);
        
        /* add temp handler */
        WM_event_add_modal_handler(C, op);
@@ -1093,7 +1093,7 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, const wmEvent *event
                        
                        /* free customdata */
                        view_zoomdrag_exit(C, op);
-                       WM_cursor_restore(CTX_wm_window(C));
+                       WM_cursor_modal_restore(CTX_wm_window(C));
                        
                        return OPERATOR_FINISHED;
                }

diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index cc3d486c2f364c2f314248a5384775687d8ac51c..197e18374bf68c56ee1c81b3409dd4ebc0ddcc53 100644 (file)
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -2968,7 +2968,7 @@ static void knifetool_exit_ex(bContext *C, KnifeTool_OpData *kcd)
                return;
 
        if (kcd->is_interactive) {
-               WM_cursor_restore(CTX_wm_window(C));
+               WM_cursor_modal_restore(CTX_wm_window(C));
 
                /* deactivate the extra drawing stuff in 3D-View */
                ED_region_draw_cb_exit(kcd->ar->type, kcd->draw_handle);
@@ -3103,7 +3103,7 @@ static int knifetool_invoke(bContext *C, wmOperator *op, const wmEvent *event)
        knifetool_init(C, kcd, only_select, cut_through, true);
 
        /* add a modal handler for this operator - handles loop selection */
-       WM_cursor_modal(CTX_wm_window(C), BC_KNIFECURSOR);
+       WM_cursor_modal_set(CTX_wm_window(C), BC_KNIFECURSOR);
        WM_event_add_modal_handler(C, op);
 
        knifetool_update_mval_i(kcd, event->mval);

diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c
index 5cb74e1ca09b73a1c204ed71f94d1da950da7ad4..6f0108654eb92d9cf8411e18d41d7e7fa381efab 100644 (file)
--- a/source/blender/editors/physics/dynamicpaint_ops.c
+++ b/source/blender/editors/physics/dynamicpaint_ops.c
@@ -384,7 +384,7 @@ static int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op)
        /* Clear bake */
        canvas->flags &= ~MOD_DPAINT_BAKING;
        if (!G.background) {
-               WM_cursor_restore(win);
+               WM_cursor_modal_restore(win);
        }
        dynamicPaint_freeSurfaceData(surface);
 

diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c
index b9742c9968fb8a130b719250f1917062059eaad0..515ac330cc9a1201c842b6be0b359f95f26723c8 100644 (file)
--- a/source/blender/editors/physics/physics_pointcache.c
+++ b/source/blender/editors/physics/physics_pointcache.c
@@ -126,7 +126,7 @@ static int ptcache_bake_all_exec(bContext *C, wmOperator *op)
         * the job system soon anyways. */
        if (win) {
                baker.progressbar = (void (*)(void *, int))WM_cursor_time;
-               baker.progressend = (void (*)(void *))WM_cursor_restore;
+               baker.progressend = (void (*)(void *))WM_cursor_modal_restore;
                baker.progresscontext = win;
        }
        else {
@@ -230,7 +230,7 @@ static int ptcache_bake_exec(bContext *C, wmOperator *op)
         * the job system soon anyways. */
        if (win) {
                baker.progressbar = (void (*)(void *, int))WM_cursor_time;
-               baker.progressend = (void (*)(void *))WM_cursor_restore;
+               baker.progressend = (void (*)(void *))WM_cursor_modal_restore;
                baker.progresscontext = win;
        }
        else {

diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 57416a59aa1b0672e96c91e642b3a4c50ffa63c8..cdebbf4e103d9ac4dbf50a31fa939a92d35cc9f3 100644 (file)
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -469,7 +469,7 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
                WM_event_remove_timer(oglrender->wm, oglrender->win, oglrender->timer);
        }
 
-       WM_cursor_restore(oglrender->win);
+       WM_cursor_modal_restore(oglrender->win);
 
        WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, oglrender->scene);
 

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index a02bd1ea391c5765c208ca318b57a3135342f0d4..10abb124c095b81686bd7e982a1583bfd713e6d6 100644 (file)
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -819,7 +819,7 @@ static int area_swap_init(wmOperator *op, const wmEvent *event)
 
 static void area_swap_exit(bContext *C, wmOperator *op)
 {
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
        if (op->customdata)
                MEM_freeN(op->customdata);
        op->customdata = NULL;
@@ -838,7 +838,7 @@ static int area_swap_invoke(bContext *C, wmOperator *op, const wmEvent *event)
                return OPERATOR_PASS_THROUGH;
        
        /* add modal handler */
-       WM_cursor_modal(CTX_wm_window(C), BC_SWAPAREA_CURSOR);
+       WM_cursor_modal_set(CTX_wm_window(C), BC_SWAPAREA_CURSOR);
        WM_event_add_modal_handler(C, op);
        
        return OPERATOR_RUNNING_MODAL;
@@ -1408,7 +1408,7 @@ static void area_split_exit(bContext *C, wmOperator *op)
                op->customdata = NULL;
        }
        
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
        WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
        
        /* this makes sure aligned edges will result in aligned grabbing */

diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index f96a0e71dfc9383d66c3525af00625c77fd5fcc8..3d4a2ba96fc10483a00106107ca7ea2c9015b659 100644 (file)
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -335,7 +335,7 @@ static void view_pan_init(bContext *C, wmOperator *op, const wmEvent *event)
        ViewPanData *vpd;
 
        op->customdata = vpd = MEM_callocN(sizeof(ViewPanData), "ClipViewPanData");
-       WM_cursor_modal(CTX_wm_window(C), BC_NSEW_SCROLLCURSOR);
+       WM_cursor_modal_set(CTX_wm_window(C), BC_NSEW_SCROLLCURSOR);
 
        vpd->x = event->x;
        vpd->y = event->y;
@@ -363,7 +363,7 @@ static void view_pan_exit(bContext *C, wmOperator *op, bool cancel)
                ED_region_tag_redraw(CTX_wm_region(C));
        }
 
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
        MEM_freeN(op->customdata);
 }
 
@@ -490,7 +490,7 @@ static void view_zoom_init(bContext *C, wmOperator *op, const wmEvent *event)
        ViewZoomData *vpd;
 
        op->customdata = vpd = MEM_callocN(sizeof(ViewZoomData), "ClipViewZoomData");
-       WM_cursor_modal(CTX_wm_window(C), BC_NSEW_SCROLLCURSOR);
+       WM_cursor_modal_set(CTX_wm_window(C), BC_NSEW_SCROLLCURSOR);
 
        vpd->x = event->x;
        vpd->y = event->y;
@@ -512,7 +512,7 @@ static void view_zoom_exit(bContext *C, wmOperator *op, bool cancel)
                ED_region_tag_redraw(CTX_wm_region(C));
        }
 
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
        MEM_freeN(op->customdata);
 }
 

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 6a3259e030e095ca1609b0e08e8c10494b319dbd..cbd3917cacb0220bb2a9fd525ad75468e5cb7bba 100644 (file)
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -245,7 +245,7 @@ static void image_view_pan_init(bContext *C, wmOperator *op, const wmEvent *even
        ViewPanData *vpd;
 
        op->customdata = vpd = MEM_callocN(sizeof(ViewPanData), "ImageViewPanData");
-       WM_cursor_modal(CTX_wm_window(C), BC_NSEW_SCROLLCURSOR);
+       WM_cursor_modal_set(CTX_wm_window(C), BC_NSEW_SCROLLCURSOR);
 
        vpd->x = event->x;
        vpd->y = event->y;
@@ -267,7 +267,7 @@ static void image_view_pan_exit(bContext *C, wmOperator *op, int cancel)
                ED_region_tag_redraw(CTX_wm_region(C));
        }
 
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
        MEM_freeN(op->customdata);
 }
 
@@ -391,7 +391,7 @@ static void image_view_zoom_init(bContext *C, wmOperator *op, const wmEvent *eve
        ViewZoomData *vpd;
 
        op->customdata = vpd = MEM_callocN(sizeof(ViewZoomData), "ImageViewZoomData");
-       WM_cursor_modal(CTX_wm_window(C), BC_NSEW_SCROLLCURSOR);
+       WM_cursor_modal_set(CTX_wm_window(C), BC_NSEW_SCROLLCURSOR);
 
        vpd->origx = event->x;
        vpd->origy = event->y;
@@ -425,7 +425,7 @@ static void image_view_zoom_exit(bContext *C, wmOperator *op, int cancel)
        if (vpd->timer)
                WM_event_remove_timer(CTX_wm_manager(C), vpd->timer->win, vpd->timer);
 
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
        MEM_freeN(op->customdata);
 }
 
@@ -2557,7 +2557,7 @@ static void image_record_composite_exit(bContext *C, wmOperator *op)
 
        scene->r.cfra = rcd->old_cfra;
 
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
 
        if (rcd->timer)
                WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), rcd->timer);

diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 3ba749a8effeb5f16e91fbb22e08b922d507c25c..ff6a8e884a6dfe9fd43af0fde77f420f6ae111a5 100644 (file)
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -854,14 +854,14 @@ static void node_resize_init(bContext *C, wmOperator *op, const wmEvent *UNUSED(
        nsw->oldminiwidth = node->miniwidth;
        nsw->directions = dir;
        
-       WM_cursor_modal(CTX_wm_window(C), node_get_resize_cursor(dir));
+       WM_cursor_modal_set(CTX_wm_window(C), node_get_resize_cursor(dir));
        /* add modal handler */
        WM_event_add_modal_handler(C, op);
 }
 
 static void node_resize_exit(bContext *C, wmOperator *op, int UNUSED(cancel))
 {
-       WM_cursor_restore(CTX_wm_window(C));
+       WM_cursor_modal_restore(CTX_wm_window(C));
        
        MEM_freeN(op->customdata);
        op->customdata = NULL;

diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c
index b2f2d5849a4d078c5e75be8c87aaeec29d9df55a..bca162d156b1a5e0af8cdcdb606855ea21b35d58 100644 (file)
--- a/source/blender/editors/space_view3d/view3d_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_ruler.c
@@ -803,7 +803,7 @@ static int view3d_ruler_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE
 
        view3d_ruler_header_update(sa);
 
-       WM_cursor_modal(win, BC_CROSSCURSOR);
+       WM_cursor_modal_set(win, BC_CROSSCURSOR);
        WM_event_add_modal_handler(C, op);
 
        return OPERATOR_RUNNING_MODAL;
@@ -1029,7 +1029,7 @@ static int view3d_ruler_modal(bContext *C, wmOperator *op, const wmEvent *event)
 
 exit:
        if (ELEM(exit_code, OPERATOR_FINISHED, OPERATOR_CANCELLED)) {
-               WM_cursor_restore(ruler_info->win);
+               WM_cursor_modal_restore(ruler_info->win);
 
                view3d_ruler_end(C, ruler_info);
                view3d_ruler_free(ruler_info);

diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index c822378e76ef1330c47ebbf2bc0fd089b02b28f1..f9fe49956af95dd382382cc74018a60f69411e6a 100644 (file)
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -120,7 +120,7 @@ static void rna_progress_update(struct wmWindowManager *wm, float value)
 static void rna_progress_end(struct wmWindowManager *wm)
 {
        if (wm_progress_state.is_valid) {
-               WM_cursor_restore(wm->winactive);
+               WM_cursor_modal_restore(wm->winactive);
                wm_progress_state.is_valid = false;
        }
 }

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 4480b8ab158c43157458420d6dbc905dad5852c7..c55898d178cef6d5c669bbefec78092631d589a4 100644 (file)
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -111,9 +111,9 @@ void                WM_autosave_init(struct wmWindowManager *wm);
 void           WM_recover_last_session(struct bContext *C, struct ReportList *reports);
 
                        /* mouse cursors */
-void           WM_cursor_set           (struct wmWindow *win, int curs);
-void           WM_cursor_modal         (struct wmWindow *win, int curs);
-void           WM_cursor_restore       (struct wmWindow *win);
+void           WM_cursor_set(struct wmWindow *win, int curs);
+void           WM_cursor_modal_set(struct wmWindow *win, int curs);
+void           WM_cursor_modal_restore(struct wmWindow *win);
 void           WM_cursor_wait          (bool val);
 void           WM_cursor_grab_enable(struct wmWindow *win, bool wrap, bool hide, int bounds[4]);
 void           WM_cursor_grab_disable(struct wmWindow *win, int mouse_ungrab_xy[2]);

diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c
index e76d38dd0e2ac94a524b63fa74631cc06cca26e7..9b308553006b5b359dcbec746b2e1d26bbb6940f 100644 (file)
--- a/source/blender/windowmanager/intern/wm_cursors.c
+++ b/source/blender/windowmanager/intern/wm_cursors.c
@@ -150,7 +150,7 @@ void WM_cursor_set(wmWindow *win, int curs)
        }
 }
 
-void WM_cursor_modal(wmWindow *win, int val)
+void WM_cursor_modal_set(wmWindow *win, int val)
 {
        if (win->lastcursor == 0)
                win->lastcursor = win->cursor;
@@ -158,7 +158,7 @@ void WM_cursor_modal(wmWindow *win, int val)
        WM_cursor_set(win, val);
 }
 
-void WM_cursor_restore(wmWindow *win)
+void WM_cursor_modal_restore(wmWindow *win)
 {
        win->modalcursor = 0;
        if (win->lastcursor)
@@ -175,10 +175,10 @@ void WM_cursor_wait(bool val)
                
                for (; win; win = win->next) {
                        if (val) {
-                               WM_cursor_modal(win, BC_WAITCURSOR);
+                               WM_cursor_modal_set(win, BC_WAITCURSOR);
                        }
                        else {
-                               WM_cursor_restore(win);
+                               WM_cursor_modal_restore(win);
                        }
                }
        }

diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c
index 0c78338c18adfa382a91797281bf13c77c627fa6..3e2d01d6e807fa5e8153b201598e855f43f3a323 100644 (file)
--- a/source/blender/windowmanager/intern/wm_dragdrop.c
+++ b/source/blender/windowmanager/intern/wm_dragdrop.c
@@ -233,10 +233,10 @@ static void wm_drop_operator_options(bContext *C, wmDrag *drag, wmEvent *event)
                
                if (opname) {
                        BLI_strncpy(drag->opname, opname, FILE_MAX);
-                       // WM_cursor_modal(win, CURSOR_COPY);
+                       // WM_cursor_modal_set(win, CURSOR_COPY);
                }
                // else
-               //      WM_cursor_restore(win);
+               //      WM_cursor_modal_restore(win);
                /* unsure about cursor type, feels to be too much */
        }
 }

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 72cd794489b7d7b463538efa149600c4702ac786..edcbca8433fee35296837f1a8360198da5836311 100644 (file)
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2103,7 +2103,7 @@ static void wm_event_drag_test(wmWindowManager *wm, wmWindow *win, wmEvent *even
                win->screen->do_draw_drag = TRUE;
                
                /* restore cursor (disabled, see wm_dragdrop.c) */
-               // WM_cursor_restore(win);
+               // WM_cursor_modal_restore(win);
        }
        
        /* overlap fails otherwise */

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 62b29266c5cc4d10d1a892ac7bdf9b500cf46e89..a7d03afb7d38943853a2f4fd815933de3aadcbbd 100644 (file)
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2756,7 +2756,7 @@ static void wm_gesture_end(bContext *C, wmOperator *op)
        ED_area_tag_redraw(CTX_wm_area(C));
        
        if (RNA_struct_find_property(op->ptr, "cursor") )
-               WM_cursor_restore(CTX_wm_window(C));
+               WM_cursor_modal_restore(CTX_wm_window(C));
 }
 
 int WM_border_select_invoke(bContext *C, wmOperator *op, const wmEvent *event)
@@ -3065,7 +3065,7 @@ int WM_gesture_lasso_invoke(bContext *C, wmOperator *op, const wmEvent *event)
        wm_gesture_tag_redraw(C);
        
        if (RNA_struct_find_property(op->ptr, "cursor") )
-               WM_cursor_modal(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor"));
+               WM_cursor_modal_set(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor"));
        
        return OPERATOR_RUNNING_MODAL;
 }
@@ -3080,7 +3080,7 @@ int WM_gesture_lines_invoke(bContext *C, wmOperator *op, const wmEvent *event)
        wm_gesture_tag_redraw(C);
        
        if (RNA_struct_find_property(op->ptr, "cursor") )
-               WM_cursor_modal(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor"));
+               WM_cursor_modal_set(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor"));
        
        return OPERATOR_RUNNING_MODAL;
 }
@@ -3297,7 +3297,7 @@ int WM_gesture_straightline_invoke(bContext *C, wmOperator *op, const wmEvent *e
        wm_gesture_tag_redraw(C);
        
        if (RNA_struct_find_property(op->ptr, "cursor") )
-               WM_cursor_modal(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor"));
+               WM_cursor_modal_set(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor"));
                
        return OPERATOR_RUNNING_MODAL;
 }

diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 65d2437a4bb2dfd952ded3be36e2f3ee5418dea0..f43f38aae5920472b095c8c305ac6ed7afb1e926 100644 (file)
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -207,7 +207,9 @@ void WM_jobs_kill_all_except(struct wmWindowManager *wm) {STUB_ASSERT(0);}
 char *WM_clipboard_text_get(int selection) {STUB_ASSERT(0); return (char *)0;}
 void WM_clipboard_text_set(char *buf, int selection) {STUB_ASSERT(0);}
 
-void   WM_cursor_restore(struct wmWindow *win) {STUB_ASSERT(0);}
+void   WM_cursor_set(struct wmWindow *win, int curor) {STUB_ASSERT(0);}
+void   WM_cursor_modal_set(struct wmWindow *win, int curor) {STUB_ASSERT(0);}
+void   WM_cursor_modal_restore(struct wmWindow *win) {STUB_ASSERT(0);}
 void   WM_cursor_time(struct wmWindow *win, int nr) {STUB_ASSERT(0);}
 
 void                WM_uilisttype_init(void) {STUB_ASSERT(0);}