[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36557] branches/bmesh/blender/source/ blender: quiet more compiler warnings, also found a bug using printf rather then fprintf.

Campbell Barton ideasman42 at gmail.com
Mon May 9 07:09:07 CEST 2011


Revision: 36557
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36557
Author:   campbellbarton
Date:     2011-05-09 05:09:07 +0000 (Mon, 09 May 2011)
Log Message:
-----------
quiet more compiler warnings, also found a bug using printf rather then fprintf.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
    branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/blenlib/BLI_array.h
    branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
    branches/bmesh/blender/source/blender/bmesh/operators/createops.c
    branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh_api.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_bevel.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_displace.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_ngoninterp.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_screw.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_shapekey.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_smooth.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_subsurf.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_wave.c

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h	2011-05-09 05:09:07 UTC (rev 36557)
@@ -118,7 +118,7 @@
   differences we care about.  should be usable with leaf's
   testing framework I get RNA work done, will use hackish
   testing code for now.*/
-char *mesh_cmp(struct Mesh *me1, struct Mesh *me2, float thresh);
+const char *mesh_cmp(struct Mesh *me1, struct Mesh *me2, float thresh);
 
 struct BoundBox *mesh_get_bb(struct Object *ob);
 void mesh_get_texspace(struct Mesh *me, float *loc_r, float *rot_r, float *size_r);

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-05-09 05:09:07 UTC (rev 36557)
@@ -1048,7 +1048,7 @@
 		}
 		
 		for (b=0; b<kb->totelem; b++, cos++) {
-			copy_v3_v3(cos, ((float*)kb->data)+b*3);
+			copy_v3_v3((float *)cos, ((float*)kb->data)+b*3);
 		}
 	}
 }

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-05-09 05:09:07 UTC (rev 36557)
@@ -867,7 +867,7 @@
                              float *sub_weights, int count, void *dest)
 {
 	float *f = dest, *src;
-	float **in = sources;
+	float **in = (float **)sources;
 	int i;
 	
 	if(count <= 0) return;

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2011-05-09 05:09:07 UTC (rev 36557)
@@ -98,7 +98,7 @@
 	MESHCMP_CDLAYERS_MISMATCH,
 };
 
-static char *cmpcode_to_str(int code)
+static const char *cmpcode_to_str(int code)
 {
 	switch (code) {
 		case MESHCMP_DVERT_WEIGHTMISMATCH:
@@ -276,7 +276,7 @@
 }
 
 /*used for testing.  returns an error string the two meshes don't match*/
-char *mesh_cmp(Mesh *me1, Mesh *me2, float thresh)
+const char *mesh_cmp(Mesh *me1, Mesh *me2, float thresh)
 {
 	int c;
 	

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-05-09 05:09:07 UTC (rev 36557)
@@ -1179,7 +1179,7 @@
 
 	fiter->head.step(fiter);
 
-	return fiter;
+	return (DMFaceIter *)fiter;
 }
 
 static void ccgDM_copyFinalFaceArray(DerivedMesh *dm, MFace *mface)

Modified: branches/bmesh/blender/source/blender/blenlib/BLI_array.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_array.h	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_array.h	2011-05-09 05:09:07 UTC (rev 36557)
@@ -64,7 +64,7 @@
 
 /*this returns the entire size of the array, including any buffering.*/
 #define BLI_array_totalsize_dyn(arr) ((arr)==NULL ? 0 : MEM_allocN_len(arr) / sizeof(*arr))
-#define BLI_array_totalsize(arr) ((signed int)((arr == _##arr##_static && arr != NULL) ? (sizeof(_##arr##_static) / sizeof(*arr)) : BLI_array_totalsize_dyn(arr)))
+#define BLI_array_totalsize(arr) ((signed int)(((void *)(arr) == (void *)_##arr##_static && (void *)(arr) != NULL) ? (sizeof(_##arr##_static) / sizeof(*arr)) : BLI_array_totalsize_dyn(arr)))
 
 /*this returns the logical size of the array, not including buffering.*/
 #define BLI_array_count(arr) _##arr##_count
@@ -74,12 +74,12 @@
 	BLI_array_totalsize(arr) > _##arr##_count ? ++_##arr##_count : \
 	((_##arr##_tmp = MEM_callocN(sizeof(*arr)*(_##arr##_count*2+2), #arr " " __FILE__ " ")),\
 	(arr && memcpy(_##arr##_tmp, arr, sizeof(*arr) * _##arr##_count)),\
-	(arr && (arr != (void*)_##arr##_static ? (MEM_freeN(arr), arr) : arr)),\
+	(arr && ((void *)(arr) != (void*)_##arr##_static ? (MEM_freeN(arr), arr) : arr)),\
 	(arr = _##arr##_tmp),\
 	_##arr##_count++)
 
 /*returns length of array*/
-#define BLI_array_growone(arr) (arr==NULL && _##arr##_static != NULL  ?  ((arr=(void*)_##arr##_static), ++_##arr##_count) : _BLI_array_growone(arr))
+#define BLI_array_growone(arr) ((void *)(arr)==NULL && (void *)(_##arr##_static) != NULL  ?  ((arr=(void*)_##arr##_static), ++_##arr##_count) : _BLI_array_growone(arr))
 
 	/*appends an item to the array and returns a pointer to the item in the array.
   item is not a pointer, but actual data value.*/
@@ -87,7 +87,7 @@
 
 /*grow an array by a specified number of items.*/
 #define BLI_array_growitems(arr, num) {int _i; for (_i=0; _i<(num); _i++) {BLI_array_growone(arr);}}
-#define BLI_array_free(arr) if (arr && arr != _##arr##_static) MEM_freeN(arr)
+#define BLI_array_free(arr) if (arr && (char *)arr != _##arr##_static) MEM_freeN(arr)
 
 #define BLI_array_pop(arr) ((arr&&_##arr##_count) ? arr[--_##arr##_count] : 0)
 /*resets the logical size of an array to zero, but doesn't

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h	2011-05-09 05:09:07 UTC (rev 36557)
@@ -356,7 +356,7 @@
 	int cur; //for arrays
 	struct GHashIterator giter;
 	void *val;
-	int restrict;
+	int restrictmask;
 } BMOIter;
 
 void *BMO_FirstElem(BMOperator *op, const char *slotname);

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2011-05-09 05:09:07 UTC (rev 36557)
@@ -345,7 +345,7 @@
 		MDisps *mdisps;
 		BMFace *f;
 		BMIter iter;
-		int i;
+		// int i= 0; // UNUSED
 		
 		multires_set_space(dm, ob, from, to);
 		
@@ -372,7 +372,7 @@
 				}
 				
 				mdisps++;
-				i += 1;	
+				// i += 1;
 			}
 		}
 		

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c	2011-05-09 05:09:07 UTC (rev 36557)
@@ -895,7 +895,7 @@
 }
 
 void *BMO_IterNew(BMOIter *iter, BMesh *UNUSED(bm), BMOperator *op,
-		  const char *slotname, int restrict)
+		  const char *slotname, int restrictmask)
 {
 	BMOpSlot *slot = BMO_GetSlot(op, slotname);
 
@@ -903,7 +903,7 @@
 
 	iter->slot = slot;
 	iter->cur = 0;
-	iter->restrict = restrict;
+	iter->restrictmask = restrictmask;
 
 	if (iter->slot->slottype == BMOP_OPSLOT_MAPPING) {
 		if (iter->slot->data.ghash)
@@ -922,7 +922,7 @@
 		if (iter->cur >= iter->slot->len) return NULL;
 
 		h = ((void**)iter->slot->data.buf)[iter->cur++];
-		while (!(iter->restrict & h->type)) {
+		while (!(iter->restrictmask & h->type)) {
 			if (iter->cur >= iter->slot->len) return NULL;
 			h = ((void**)iter->slot->data.buf)[iter->cur++];
 		}

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c	2011-05-09 05:09:07 UTC (rev 36557)
@@ -101,7 +101,7 @@
 	
 	if (type >= BMW_MAXWALKERS || type < 0) {
 		bmesh_error();
-		printf(stderr, "Invalid walker type in BMW_Init; type: %d, searchmask: %d, flag: %d\n", type, searchmask, flag);
+		fprintf(stderr, "Invalid walker type in BMW_Init; type: %d, searchmask: %d, flag: %d\n", type, searchmask, flag);
 	}
 	
 	if (type != BMW_CUSTOM) {

Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c	2011-05-09 05:09:07 UTC (rev 36557)
@@ -116,7 +116,7 @@
 	}
 
 	if (vd->e == e)
-		vd->e = e!=e1->next ? (BMEdge*)e1->next : NULL;
+		vd->e = (e != (BMEdge *)e1->next) ? (BMEdge*)e1->next : NULL;
 
 	e1->next = e1->prev = NULL;
 }

Modified: branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_mesh.h	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/editors/include/ED_mesh.h	2011-05-09 05:09:07 UTC (rev 36557)
@@ -75,7 +75,7 @@
 struct Object;
 struct rcti;
 struct wmOperator;
-struct ToolSeetings;
+struct ToolSettings;
 
 // edge and face flag both
 #define EM_FGON		2

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2011-05-09 04:06:48 UTC (rev 36556)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2011-05-09 05:09:07 UTC (rev 36557)
@@ -4499,6 +4499,7 @@
 /* all verts with (flag & 'flag') are sorted */
 static void xsortvert_flag(bContext *UNUSED(C), int UNUSED(flag))
 {
+	/*BMESH_TODO*/
 #if 0 //hrm, geometry isn't in linked lists anymore. . .
 	ViewContext vc;
 	BMEditMesh *em;
@@ -4627,7 +4628,9 @@
 {
 	Object *obedit= CTX_data_edit_object(C);
 	BMEditMesh *em= ((Mesh *)obedit->data)->edit_btmesh;
-	//hashvert_flag(em, SELECT);
+#if 0 /*BMESH TODO*/

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list