[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40549] branches/bmesh/blender/source/ blender: BMesh branch-specific warning fixes for MSVC 2010 warnings

[Andrew Wiggin]

Revision: 40549
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40549
Author:   ender79
Date:     2011-09-26 05:35:57 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
BMesh branch-specific warning fixes for MSVC 2010 warnings

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c

Modified: branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/knifetool.c	2011-09-26 05:26:04 UTC (rev 40548)
+++ branches/bmesh/blender/source/blender/editors/mesh/knifetool.c	2011-09-26 05:35:57 UTC (rev 40549)
@@ -799,7 +799,7 @@
 			BMLoop *l1 = ls[j];
 			BMFace *hitf;
 			ListBase *lst = knife_get_face_kedges(kcd, l1->f);
-			Ref *ref, *ref2;
+			Ref *ref;
 			
 			for (ref=lst->first; ref; ref=ref->next) {			
 				KnifeEdge *kfe = ref->ref;

Modified: branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c	2011-09-26 05:26:04 UTC (rev 40548)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c	2011-09-26 05:35:57 UTC (rev 40549)
@@ -2459,7 +2459,7 @@
 		BMFace *f;
 		int n;
 
-#define DRAW_EM_MEASURE_STATS_FACEAREA(void)\
+#define DRAW_EM_MEASURE_STATS_FACEAREA()\
 		if (BM_TestHFlag(f, BM_SELECT)) {\
 			mul_v3_fl(vmid, 1.0/n);\
 			if(unit->system)\

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c	2011-09-26 05:26:04 UTC (rev 40548)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c	2011-09-26 05:35:57 UTC (rev 40549)
@@ -485,7 +485,6 @@
 	unsigned char col1[4], col2[4];
 	float pointsize;
 	int drawfaces, interpedges;
-	int i;
 	Image *ima= sima->image;
 
 	em= me->edit_btmesh;

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c	2011-09-26 05:26:04 UTC (rev 40548)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c	2011-09-26 05:35:57 UTC (rev 40549)
@@ -2351,7 +2351,7 @@
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
+	/* MTexPoly *tf; */
 	
 	if((ts->uv_flag & UV_SYNC_SELECTION)==0 && sima->sticky == SI_STICKY_VERTEX) {
 		/* Tag all verts as untouched, then touch the ones that have a face center

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2011-09-26 05:26:04 UTC (rev 40548)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2011-09-26 05:35:57 UTC (rev 40549)
@@ -147,7 +147,6 @@
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
 	MLoopUV *luv;
 	
 	/* verify if we have any selected uv's before unwrapping,

Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c	2011-09-26 05:26:04 UTC (rev 40548)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c	2011-09-26 05:35:57 UTC (rev 40549)
@@ -292,7 +292,7 @@
 	}
 }
 
-static EnumPropertyItem *rna_Curve_fill_mode_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free)
+static const EnumPropertyItem *rna_Curve_fill_mode_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free)
 {
 	Curve *cu= (Curve*)ptr->id.data;
 

Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c	2011-09-26 05:26:04 UTC (rev 40548)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c	2011-09-26 05:35:57 UTC (rev 40549)
@@ -1818,10 +1818,10 @@
 {
 	StructRNA *srna;
 
-	PropertyRNA *prop;
+	/*PropertyRNA *prop;*/
 
 	FunctionRNA *func;
-//	PropertyRNA *parm;
+	/*PropertyRNA *parm;*/
 
 	RNA_def_property_srna(cprop, "MeshLoops");
 	srna= RNA_def_struct(brna, "MeshLoops", NULL);