[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58984] trunk/blender/source/blender: quiet shadow warnings and remove redundant NULL check

[Campbell Barton]

Revision: 58984
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58984
Author:   campbellbarton
Date:     2013-08-07 04:31:05 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
quiet shadow warnings and remove redundant NULL check

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-08-07 03:55:21 UTC (rev 58983)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-08-07 04:31:05 UTC (rev 58984)
@@ -6623,8 +6623,8 @@
 		/* 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));

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2013-08-07 03:55:21 UTC (rev 58983)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2013-08-07 04:31:05 UTC (rev 58984)
@@ -547,7 +547,6 @@
 			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);
 		}
 	}

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2013-08-07 03:55:21 UTC (rev 58983)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2013-08-07 04:31:05 UTC (rev 58984)
@@ -881,8 +881,8 @@
 					/* 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;

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2013-08-07 03:55:21 UTC (rev 58983)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2013-08-07 04:31:05 UTC (rev 58984)
@@ -4719,11 +4719,8 @@
 		             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)