[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59902] trunk/blender/source: rename cursor setting functions to make modal set/ restore more clearly related functions.
Campbell Barton
ideasman42 at gmail.com
Sat Sep 7 00:34:29 CEST 2013
Revision: 59902
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59902
Author: campbellbarton
Date: 2013-09-06 22:34:29 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
rename cursor setting functions to make modal set/restore more clearly related functions.
Modified Paths:
--------------
trunk/blender/source/blender/editors/armature/pose_slide.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_ops.c
trunk/blender/source/blender/editors/interface/view2d_ops.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/editors/physics/physics_pointcache.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blender/windowmanager/intern/wm_dragdrop.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/editors/armature/pose_slide.c
===================================================================
--- trunk/blender/source/blender/editors/armature/pose_slide.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/armature/pose_slide.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -602,7 +602,7 @@
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 @@
{
/* 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 @@
{
/* 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);
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -1431,7 +1431,7 @@
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 @@
/* 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
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -1981,7 +1981,7 @@
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 @@
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)
Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -118,7 +118,7 @@
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 @@
{
/* 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);
Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -219,11 +219,11 @@
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 @@
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 @@
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 @@
}
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 @@
/* 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;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -2968,7 +2968,7 @@
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 @@
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);
Modified: trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -384,7 +384,7 @@
/* Clear bake */
canvas->flags &= ~MOD_DPAINT_BAKING;
if (!G.background) {
- WM_cursor_restore(win);
+ WM_cursor_modal_restore(win);
}
dynamicPaint_freeSurfaceData(surface);
Modified: trunk/blender/source/blender/editors/physics/physics_pointcache.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_pointcache.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/physics/physics_pointcache.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -126,7 +126,7 @@
* 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 @@
* 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 {
Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/render/render_opengl.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -469,7 +469,7 @@
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);
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2013-09-06 17:59:09 UTC (rev 59901)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2013-09-06 22:34:29 UTC (rev 59902)
@@ -819,7 +819,7 @@
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 @@
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 @@
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 */
Modified: trunk/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_ops.c 2013-09-06 17:59:09 UTC (rev 59901)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list