[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55321] trunk/blender: code cleanup: quiet some -Wshadow warnings, mix of obvious mistakes and harmless global/ local naming conflict.
Campbell Barton
ideasman42 at gmail.com
Fri Mar 15 23:55:10 CET 2013
Revision: 55321
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55321
Author: campbellbarton
Date: 2013-03-15 22:55:10 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
code cleanup: quiet some -Wshadow warnings, mix of obvious mistakes and harmless global/local naming conflict.
Modified Paths:
--------------
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2013-03-15 22:32:44 UTC (rev 55320)
+++ trunk/blender/build_files/cmake/macros.cmake 2013-03-15 22:55:10 UTC (rev 55321)
@@ -492,6 +492,7 @@
remove_cc_flag("-Wredundant-decls")
remove_cc_flag("-Wundef")
remove_cc_flag("-Wshadow")
+ remove_cc_flag("-Wold-style-definition")
remove_cc_flag("-Werror=[^ ]+")
remove_cc_flag("-Werror")
Modified: trunk/blender/source/blender/blenlib/intern/noise.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/noise.c 2013-03-15 22:32:44 UTC (rev 55320)
+++ trunk/blender/source/blender/blenlib/intern/noise.c 2013-03-15 22:55:10 UTC (rev 55321)
@@ -281,9 +281,9 @@
return (t * t * t * (t * (t * 6.0f - 15.0f) + 10.0f));
}
-static float grad(int hash, float x, float y, float z)
+static float grad(int hash_val, float x, float y, float z)
{
- int h = hash & 15; /* CONVERT LO 4 BITS OF HASH CODE */
+ int h = hash_val & 15; /* CONVERT LO 4 BITS OF HASH CODE */
float u = h < 8 ? x : y, /* INTO 12 GRADIENT DIRECTIONS. */
v = h < 4 ? y : h == 12 || h == 14 ? x : z;
return ((h & 1) == 0 ? u : -u) + ((h & 2) == 0 ? v : -v);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2013-03-15 22:32:44 UTC (rev 55320)
+++ trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2013-03-15 22:55:10 UTC (rev 55321)
@@ -271,7 +271,7 @@
BMOIter siter;
BMIter iter, fiter, viter;
BMEdge *e, *e_new;
- BMVert *v, *v2;
+ BMVert *v;
BMFace *f;
bool found, fwd, delorig = false;
BMOpSlot *slot_facemap_out;
@@ -441,7 +441,7 @@
/* link isolated vert */
for (v = BMO_iter_new(&siter, dupeop.slots_out, "isovert_map.out", 0); v; v = BMO_iter_step(&siter)) {
- v2 = *((void **)BMO_iter_map_value(&siter));
+ BMVert *v2 = *((void **)BMO_iter_map_value(&siter));
BM_edge_create(bm, v, v2, v->e, BM_CREATE_NO_DOUBLE);
}
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-03-15 22:32:44 UTC (rev 55320)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-03-15 22:55:10 UTC (rev 55321)
@@ -235,14 +235,13 @@
BLI_assert(*type == MOUSEPAN);
/* sign differs, reset */
- if ((dy > 0 && lastdy < 0) || (dy < 0 && lastdy > 0))
+ if ((dy > 0 && lastdy < 0) || (dy < 0 && lastdy > 0)) {
lastdy = dy;
+ }
else {
lastdy += dy;
if (ABS(lastdy) > (int)UI_UNIT_Y) {
- int dy = event->prevy - event->y;
-
if (U.uiflag2 & USER_TRACKPAD_NATURAL)
dy = -dy;
@@ -804,8 +803,6 @@
* button we mouse over is X or Y aligned, then lock the mouse to that axis after.
*/
if (drag_info->xy_lock[0] == false && drag_info->xy_lock[1] == false) {
- ARegion *ar = CTX_wm_region(C);
-
/* first store the buttons original coords */
uiBut *but = ui_but_find_mouse_over(ar, xy_input[0], xy_input[1]);
if (but) {
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c 2013-03-15 22:32:44 UTC (rev 55320)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c 2013-03-15 22:55:10 UTC (rev 55321)
@@ -663,9 +663,9 @@
/* since the text has beens caled already, the size of tooltips is defined now */
/* here we try to figure out the right location */
if (butregion) {
- float ofsx = rect_fl.xmin, ofsy = rect_fl.ymax;
- ui_block_to_window_fl(butregion, but->block, &ofsx, &ofsy);
- BLI_rctf_translate(&rect_fl, ofsx - rect_fl.xmin, ofsy - rect_fl.ymax);
+ float ofsx_fl = rect_fl.xmin, ofsy_fl = rect_fl.ymax;
+ ui_block_to_window_fl(butregion, but->block, &ofsx_fl, &ofsy_fl);
+ BLI_rctf_translate(&rect_fl, ofsx_fl - rect_fl.xmin, ofsy_fl - rect_fl.ymax);
}
BLI_rcti_rctf_copy(&rect_i, &rect_fl);
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2013-03-15 22:32:44 UTC (rev 55320)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2013-03-15 22:55:10 UTC (rev 55321)
@@ -188,8 +188,8 @@
/* *************************** Preview for buttons *********************** */
-static Main *pr_main = NULL;
-static Main *pr_main_cycles = NULL;
+static Main *G_pr_main = NULL;
+static Main *G_pr_main_cycles = NULL;
#ifndef WITH_HEADLESS
static Main *load_main_from_memory(char *blend, int blend_size)
@@ -214,18 +214,18 @@
void ED_preview_init_dbase(void)
{
#ifndef WITH_HEADLESS
- pr_main = load_main_from_memory(datatoc_preview_blend, datatoc_preview_blend_size);
- pr_main_cycles = load_main_from_memory(datatoc_preview_cycles_blend, datatoc_preview_cycles_blend_size);
+ G_pr_main = load_main_from_memory(datatoc_preview_blend, datatoc_preview_blend_size);
+ G_pr_main_cycles = load_main_from_memory(datatoc_preview_cycles_blend, datatoc_preview_cycles_blend_size);
#endif
}
void ED_preview_free_dbase(void)
{
- if (pr_main)
- free_main(pr_main);
+ if (G_pr_main)
+ free_main(G_pr_main);
- if (pr_main_cycles)
- free_main(pr_main_cycles);
+ if (G_pr_main_cycles)
+ free_main(G_pr_main_cycles);
}
static int preview_mat_has_sss(Material *mat, bNodeTree *ntree)
@@ -1028,7 +1028,7 @@
sp->pr_method = PR_ICON_RENDER;
sp->pr_rect = cur_size->rect;
sp->id = ip->id;
- sp->pr_main = pr_main;
+ sp->pr_main = G_pr_main;
common_preview_startjob(sp, stop, do_update, progress);
shader_preview_free(sp);
@@ -1131,9 +1131,9 @@
/* hardcoded preview .blend for cycles/internal, this should be solved
* once with custom preview .blend path for external engines */
if (BKE_scene_use_new_shading_nodes(scene))
- sp->pr_main = pr_main_cycles;
+ sp->pr_main = G_pr_main_cycles;
else
- sp->pr_main = pr_main;
+ sp->pr_main = G_pr_main;
if (ob && ob->totcol) copy_v4_v4(sp->col, ob->col);
else sp->col[0] = sp->col[1] = sp->col[2] = sp->col[3] = 1.0f;
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c 2013-03-15 22:32:44 UTC (rev 55320)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c 2013-03-15 22:55:10 UTC (rev 55321)
@@ -548,7 +548,6 @@
RNAUpdateCb *cb;
Image *ima;
ImageUser *iuser;
- ImBuf *ibuf;
Scene *scene = CTX_data_scene(C);
uiLayout *row, *split, *col;
uiBlock *block;
@@ -595,7 +594,7 @@
uiBlockSetNFunc(block, rna_update_cb, MEM_dupallocN(cb), NULL);
if (ima->source == IMA_SRC_VIEWER) {
- ibuf = BKE_image_acquire_ibuf(ima, iuser, &lock);
+ ImBuf *ibuf = BKE_image_acquire_ibuf(ima, iuser, &lock);
image_info(scene, iuser, ima, ibuf, str, MAX_INFO_LEN);
BKE_image_release_ibuf(ima, ibuf, lock);
@@ -665,7 +664,7 @@
}
else if (ima->source != IMA_SRC_GENERATED) {
if (compact == 0) {
- ibuf = BKE_image_acquire_ibuf(ima, iuser, &lock);
+ ImBuf *ibuf = BKE_image_acquire_ibuf(ima, iuser, &lock);
image_info(scene, iuser, ima, ibuf, str, MAX_INFO_LEN);
BKE_image_release_ibuf(ima, ibuf, lock);
uiItemL(layout, str, ICON_NONE);
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2013-03-15 22:32:44 UTC (rev 55320)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2013-03-15 22:55:10 UTC (rev 55321)
@@ -471,7 +471,7 @@
}
-static void view3d_main_area_exit(wmWindowManager *wm, ARegion *ar)
+static void view3d_main_area_exit(wmWindowManager *UNUSED(wm), ARegion *ar)
{
RegionView3D *rv3d = ar->regiondata;
Modified: trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c 2013-03-15 22:32:44 UTC (rev 55320)
+++ trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c 2013-03-15 22:55:10 UTC (rev 55321)
@@ -257,9 +257,9 @@
glViewport(_curswin->winrct.xmin, _curswin->winrct.ymin, width, height);
if (srct) {
- int width = BLI_rcti_size_x(srct) + 1; /* only here */
- int height = BLI_rcti_size_y(srct) + 1;
- glScissor(srct->xmin, srct->ymin, width, height);
+ int scissor_width = BLI_rcti_size_x(srct) + 1; /* only here */
+ int scissor_height = BLI_rcti_size_y(srct) + 1;
+ glScissor(srct->xmin, srct->ymin, scissor_width, scissor_height);
}
else
glScissor(_curswin->winrct.xmin, _curswin->winrct.ymin, width, height);
More information about the Bf-blender-cvs
mailing list