From f5c66a3676da2141b240896ad701689f83f5a143 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 7 Aug 2013 04:31:05 +0000 Subject: quiet shadow warnings and remove redundant NULL check --- source/blender/editors/interface/interface_handlers.c | 4 ++-- source/blender/editors/object/object_vgroup.c | 1 - source/blender/editors/space_view3d/space_view3d.c | 4 ++-- source/blender/render/intern/source/convertblender.c | 7 ++----- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index b3df719d95a..622559cd30f 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6623,8 +6623,8 @@ static bool ui_mouse_motion_towards_check(uiBlock *block, uiPopupBlockHandle *me /* am I the last menu (test) */ ARegion *ar = menu->region->next; do { - uiBlock *block = ar->uiblocks.first; - if (block && ui_block_is_menu(block)) { + uiBlock *block_iter = ar->uiblocks.first; + if (block_iter && ui_block_is_menu(block_iter)) { return true; } } while ((ar = ar->next)); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 9b3f1a4f3ac..294b0632015 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -547,7 +547,6 @@ static void vgroup_normalize_active(Object *ob, eVGroupSelect subset_type) ED_mesh_defvert_mirror_update_em(ob, eve_act, -1, -1, cd_dvert_offset); } else { - int v_act = BKE_mesh_mselect_active_get(me, ME_VSEL); ED_mesh_defvert_mirror_update_ob(ob, -1, v_act); } } diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index dfbc973ee85..a65f0af74a5 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -881,8 +881,8 @@ static void view3d_main_area_listener(bScreen *sc, ScrArea *sa, ARegion *ar, wmN /* screen was changed, need to update used layers due to NC_SCENE|ND_LAYER_CONTENT */ /* updates used layers only for View3D in active screen */ if (wmn->reference) { - bScreen *sc = wmn->reference; - view3d_recalc_used_layers(ar, wmn, sc->scene); + bScreen *sc_ref = wmn->reference; + view3d_recalc_used_layers(ar, wmn, sc_ref->scene); } ED_region_tag_redraw(ar); break; diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 3d93c207493..e29cea279ce 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4719,11 +4719,8 @@ static void set_dupli_tex_mat(Render *re, ObjectInstanceRen *obi, DupliObject *d NULL, NULL, NULL, NULL); } - if (dob) { - copy_v3_v3(obi->dupliorco, dob->orco); - obi->dupliuv[0]= dob->uv[0]; - obi->dupliuv[1]= dob->uv[1]; - } + copy_v3_v3(obi->dupliorco, dob->orco); + copy_v2_v2(obi->dupliuv, dob->uv); } static void init_render_object_data(Render *re, ObjectRen *obr, int timeoffset) -- cgit v1.2.3