quiet shadow warnings and remove redundant NULL check
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Aug 2013 04:31:05 +0000 (04:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Aug 2013 04:31:05 +0000 (04:31 +0000)
source/blender/editors/interface/interface_handlers.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/render/intern/source/convertblender.c

index b3df719d95abe016c9c65ccb3e0522c893dbd01e..622559cd30f26870e870437e001e0f2fa888c01a 100644 (file)
@@ -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));
index 9b3f1a4f3acedaf58a74b83259a47cc37f181f8b..294b0632015a6ab71d71b5c24478f1983555ccc8 100644 (file)
@@ -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);
                }
        }
index dfbc973ee859238f441ebc1d74f649888c76fc4d..a65f0af74a5e184631c277ef6004d7e0bb0b06b1 100644 (file)
@@ -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;
index 3d93c20749308fb4145b6753d5cf47bef6390b10..e29cea279cec4497402378e22295ddd7873a0aae 100644 (file)
@@ -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)