[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49823] trunk/blender: code cleanup: WM naming conventions
Campbell Barton
ideasman42 at gmail.com
Sat Aug 11 23:35:25 CEST 2012
Revision: 49823
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49823
Author: campbellbarton
Date: 2012-08-11 21:35:24 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
code cleanup: WM naming conventions
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.h
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/physics/physics_pointcache.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_file/filelist.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_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/WM_types.h
trunk/blender/source/blender/windowmanager/intern/wm_apple.c
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowWin32.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowWin32.h 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowWin32.h 2012-08-11 21:35:24 UTC (rev 49823)
@@ -344,7 +344,7 @@
static HDC s_firstHDC;
/** Flag for if window has captured the mouse */
bool m_hasMouseCaptured;
- /** Flag if an operator grabs the mouse with WM_cursor_grab/ungrab()
+ /** Flag if an operator grabs the mouse with WM_cursor_grab_enable/ungrab()
* Multiple grabs must be realesed with a single ungrab*/
bool m_hasGrabMouse;
/** Count of number of pressed buttons */
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -5222,13 +5222,13 @@
/* number editing */
if (state == BUTTON_STATE_NUM_EDITING) {
if (ui_is_a_warp_but(but))
- WM_cursor_grab(CTX_wm_window(C), TRUE, TRUE, NULL);
+ WM_cursor_grab_enable(CTX_wm_window(C), TRUE, TRUE, NULL);
ui_numedit_begin(but, data);
}
else if (data->state == BUTTON_STATE_NUM_EDITING) {
ui_numedit_end(but, data);
if (ui_is_a_warp_but(but))
- WM_cursor_ungrab(CTX_wm_window(C));
+ WM_cursor_grab_disable(CTX_wm_window(C));
}
/* menu open */
if (state == BUTTON_STATE_MENU_OPEN)
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -521,7 +521,7 @@
if (!facesel_face_pick(C, me, ob, mval, &index, 1))
return 0;
- if (index >= me->totpoly || index < 0)
+ if (index >= me->totpoly)
return 0;
mpoly_sel = me->mpoly + index;
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -1256,7 +1256,7 @@
/* setup job */
steve = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene, "Multires Bake", WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS);
- WM_jobs_customdata(steve, bkr, multiresbake_freejob);
+ WM_jobs_customdata_set(steve, bkr, multiresbake_freejob);
WM_jobs_timer(steve, 0.2, NC_IMAGE, 0); /* TODO - only draw bake image, can we enforce this */
WM_jobs_callbacks(steve, multiresbake_startjob, NULL, NULL, NULL);
@@ -1483,7 +1483,7 @@
/* setup job */
steve = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene, "Texture Bake", WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS);
- WM_jobs_customdata(steve, bkr, bake_freejob);
+ WM_jobs_customdata_set(steve, bkr, bake_freejob);
WM_jobs_timer(steve, 0.2, NC_IMAGE, 0); /* TODO - only draw bake image, can we enforce this */
WM_jobs_callbacks(steve, bake_startjob, NULL, bake_update, NULL);
Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/object/object_modifier.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -2187,7 +2187,7 @@
oj->och = och;
oj->omd = omd;
- WM_jobs_customdata(steve, oj, oceanbake_free);
+ WM_jobs_customdata_set(steve, oj, oceanbake_free);
WM_jobs_timer(steve, 0.1, NC_OBJECT | ND_MODIFIER, NC_OBJECT | ND_MODIFIER);
WM_jobs_callbacks(steve, oceanbake_startjob, NULL, NULL, oceanbake_endjob);
Modified: trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -299,7 +299,7 @@
if (blender_test_break()) return 0;
/* Update progress bar cursor */
- WM_timecursor(win, (int)progress);
+ WM_cursor_time(win, (int)progress);
/* calculate a frame */
scene->r.cfra = (int)frame;
Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -1071,7 +1071,7 @@
wmJob *steve= WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene, "Fluid Simulation", WM_JOB_PROGRESS);
/* setup job */
- WM_jobs_customdata(steve, fb, fluidbake_free);
+ WM_jobs_customdata_set(steve, fb, fluidbake_free);
WM_jobs_timer(steve, 0.1, NC_SCENE|ND_FRAME, NC_SCENE|ND_FRAME);
WM_jobs_callbacks(steve, fluidbake_startjob, NULL, NULL, fluidbake_endjob);
Modified: trunk/blender/source/blender/editors/physics/physics_pointcache.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_pointcache.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/physics/physics_pointcache.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -111,7 +111,7 @@
* and pointcache baking will be reimplemented with
* the job system soon anyways. */
if (win) {
- baker.progressbar = (void (*)(void *, int))WM_timecursor;
+ baker.progressbar = (void (*)(void *, int))WM_cursor_time;
baker.progressend = (void (*)(void *))WM_cursor_restore;
baker.progresscontext = win;
}
@@ -215,7 +215,7 @@
* and pointcache baking will be reimplemented with
* the job system soon anyways. */
if (win) {
- baker.progressbar = (void (*)(void *, int))WM_timecursor;
+ baker.progressbar = (void (*)(void *, int))WM_cursor_time;
baker.progressend = (void (*)(void *))WM_cursor_restore;
baker.progresscontext = win;
}
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -565,7 +565,7 @@
else name = "Render";
steve = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene, name, jobflag);
- WM_jobs_customdata(steve, rj, render_freejob);
+ WM_jobs_customdata_set(steve, rj, render_freejob);
WM_jobs_timer(steve, 0.2, NC_SCENE | ND_RENDER_RESULT, 0);
WM_jobs_callbacks(steve, render_startjob, NULL, NULL, render_endjob);
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -1031,7 +1031,7 @@
ip = MEM_callocN(sizeof(IconPreview), "icon preview");
/* render all resolutions from suspended job too */
- old_ip = WM_jobs_get_customdata(steve);
+ old_ip = WM_jobs_customdata_get(steve);
if (old_ip)
BLI_movelisttolist(&ip->sizes, &old_ip->sizes);
@@ -1043,7 +1043,7 @@
icon_preview_add_size(ip, rect, sizex, sizey);
/* setup job */
- WM_jobs_customdata(steve, ip, icon_preview_free);
+ WM_jobs_customdata_set(steve, ip, icon_preview_free);
WM_jobs_timer(steve, 0.25, NC_MATERIAL, NC_MATERIAL);
WM_jobs_callbacks(steve, icon_preview_startjob_all_sizes, NULL, NULL, icon_preview_endjob);
@@ -1072,7 +1072,7 @@
else sp->col[0] = sp->col[1] = sp->col[2] = sp->col[3] = 1.0f;
/* setup job */
- WM_jobs_customdata(steve, sp, shader_preview_free);
+ WM_jobs_customdata_set(steve, sp, shader_preview_free);
WM_jobs_timer(steve, 0.1, NC_MATERIAL, NC_MATERIAL);
WM_jobs_callbacks(steve, common_preview_startjob, NULL, shader_preview_updatejob, NULL);
Modified: trunk/blender/source/blender/editors/screen/screendump.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screendump.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/screen/screendump.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -420,7 +420,7 @@
BKE_reports_init(&sj->reports, RPT_PRINT);
/* setup job */
- WM_jobs_customdata(steve, sj, screenshot_freejob);
+ WM_jobs_customdata_set(steve, sj, screenshot_freejob);
WM_jobs_timer(steve, 0.1, 0, NC_SCREEN | ND_SCREENCAST);
WM_jobs_callbacks(steve, screenshot_startjob, NULL, screenshot_updatejob, NULL);
Modified: trunk/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -1054,7 +1054,7 @@
clip->proxy.build_size_flag, clip->proxy.quality);
}
- WM_jobs_customdata(steve, pj, proxy_freejob);
+ WM_jobs_customdata_set(steve, pj, proxy_freejob);
WM_jobs_timer(steve, 0.2, NC_MOVIECLIP | ND_DISPLAY, 0);
WM_jobs_callbacks(steve, proxy_startjob, NULL, NULL, proxy_endjob);
Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2012-08-11 20:05:26 UTC (rev 49822)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2012-08-11 21:35:24 UTC (rev 49823)
@@ -1262,7 +1262,7 @@
/* setup job */
steve = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), sa, "Track Markers", WM_JOB_PROGRESS);
- WM_jobs_customdata(steve, tmj, track_markers_freejob);
+ WM_jobs_customdata_set(steve, tmj, track_markers_freejob);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list