[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38727] trunk/blender/source/blender: correct misc warnings

[Campbell Barton]

Revision: 38727
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38727
Author:   campbellbarton
Date:     2011-07-26 13:33:04 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
correct misc warnings

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/editors/transform/transform_snap.c
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
    trunk/blender/source/blender/makesrna/intern/rna_object_api.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2011-07-26 13:09:10 UTC (rev 38726)
+++ trunk/blender/source/blender/editors/object/object_add.c	2011-07-26 13:33:04 UTC (rev 38727)
@@ -806,14 +806,14 @@
 {
 	Main *bmain= CTX_data_main(C);
 	Scene *scene= CTX_data_scene(C);
-	int islamp= 0;
+	/* int islamp= 0; */ /* UNUSED */
 	
 	if(CTX_data_edit_object(C)) 
 		return OPERATOR_CANCELLED;
 	
 	CTX_DATA_BEGIN(C, Base*, base, selected_bases) {
 
-		if(base->object->type==OB_LAMP) islamp= 1;
+		/* if(base->object->type==OB_LAMP) islamp= 1; */
 
 		/* deselect object -- it could be used in other scenes */
 		base->object->flag &= ~SELECT;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2011-07-26 13:09:10 UTC (rev 38726)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2011-07-26 13:33:04 UTC (rev 38727)
@@ -129,7 +129,6 @@
 		}
 		else {
 			ED_view3d_to_object(v3d->camera, rv3d->ofs, rv3d->viewquat, rv3d->dist);
-			root_parent= v3d->camera;
 			DAG_id_tag_update(&v3d->camera->id, OB_RECALC_OB);
 			WM_main_add_notifier(NC_OBJECT|ND_TRANSFORM, v3d->camera);
 		}

Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c	2011-07-26 13:09:10 UTC (rev 38726)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c	2011-07-26 13:33:04 UTC (rev 38727)
@@ -1944,6 +1944,11 @@
 	int i;
 	float asp[3] = {1.0f, 1.0f, 1.0f}; // TODO: Remove hard coded limit here (3)
 
+	if(max_index > 3) {
+		printf("applyGrid: invalid index %d, clamping\n", max_index);
+		max_index= 3;
+	}
+
 	// Early bailing out if no need to snap
 	if (fac[action] == 0.0f)
 		return;

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2011-07-26 13:09:10 UTC (rev 38726)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2011-07-26 13:33:04 UTC (rev 38727)
@@ -1060,8 +1060,8 @@
 	if(tool == 's' || tool == 't' || tool == 'u') {
 		 /* pass 1&2 variables */
 		int i, j;
-		int starttmpl= -1, connectedtostarttmpl, startcorner;
-		int endtmpl= -1,   connectedtoendtmpl,   endcorner;
+		int starttmpl= -1, connectedtostarttmpl= -1, startcorner;
+		int endtmpl= -1,   connectedtoendtmpl= -1,   endcorner;
 		MTFace *startface, *endface;
 		int itmpl, jtmpl;
 		EditVert *eve;

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_api.c	2011-07-26 13:09:10 UTC (rev 38726)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c	2011-07-26 13:33:04 UTC (rev 38727)
@@ -544,7 +544,7 @@
 	/* location of point for test and max distance */
 	parm= RNA_def_float_vector(func, "point", 3, NULL, -FLT_MAX, FLT_MAX, "", "", -1e4, 1e4);
 	RNA_def_property_flag(parm, PROP_REQUIRED);
-	parm= RNA_def_float(func, "max_dist", sqrt(FLT_MAX), 0.0, FLT_MAX, "", "", 0.0, FLT_MAX);
+	RNA_def_float(func, "max_dist", sqrt(FLT_MAX), 0.0, FLT_MAX, "", "", 0.0, FLT_MAX);
 
 	/* return location and normal */
 	parm= RNA_def_float_vector(func, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "The location on the object closest to the point", -1e4, 1e4);