2.5: various warning fixes. There was one actual bug in a few different

places, using sprintf with strings like ID names as the format string
(note that this name can contain a % character).

6 files changed, 12 insertions, 6 deletions

diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c
index 8aaa7aca023..3ddd790e90b 100644
--- a/source/blender/blenkernel/intern/BME_tools.c
+++ b/source/blender/blenkernel/intern/BME_tools.c
@@ -205,6 +205,7 @@ static BME_Poly *BME_split_face(BME_Mesh *bm, BME_Poly *f, BME_Vert *v1, BME_Ver
 }
 
 
+#if 0
 static void BME_data_interp_from_verts(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2, BME_Vert *v, float fac)
 {
 	void *src[2];
@@ -217,6 +218,7 @@ static void BME_data_interp_from_verts(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2,
 		CustomData_bmesh_interp(&bm->vdata, src, w, NULL, 2, v->data);
 	}
 }
+#endif
 
 
 static void BME_data_facevert_edgesplit(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2, BME_Vert *v, BME_Edge *e1, float fac){
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index a32737762be..26afa0967c1 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -954,7 +954,7 @@ static Object *find_family_object(Object **obar, char *family, char ch)
 	Object *ob;
 	int flen;
 	
-	if( obar[ch] ) return obar[ch];
+	if( obar[(int)ch] ) return obar[(int)ch];
 	
 	flen= strlen(family);
 	
@@ -966,7 +966,7 @@ static Object *find_family_object(Object **obar, char *family, char ch)
 		ob= ob->id.next;
 	}
 	
-	obar[ch]= ob;
+	obar[(int)ch]= ob;
 	
 	return ob;
 }
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 9db3dda94eb..4f8068ac252 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -591,7 +591,9 @@ CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTreeOverlap
 	ClothModifierData *clmd = ( ClothModifierData * ) md1;
 	CollisionModifierData *collmd = ( CollisionModifierData * ) md2;
 	MFace *face1=NULL, *face2 = NULL;
+#ifdef WITH_BULLET
 	ClothVertex *verts1 = clmd->clothObject->verts;
+#endif
 	double distance = 0;
 	float epsilon1 = clmd->coll_parms->epsilon;
 	float epsilon2 = BLI_bvhtree_getepsilon ( collmd->bvhtree );
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index c71664d09a7..3a9e0eb8feb 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1454,7 +1454,7 @@ void makeDispListCurveTypes(Object *ob, int forOrco)
 		ListBase dlbev;
 		float (*originalVerts)[3];
 		float (*deformedVerts)[3];
-		int obedit= (G.obedit && G.obedit->data==ob->data && G.obedit->type==OB_CURVE);
+		//XXX int obedit= (G.obedit && G.obedit->data==ob->data && G.obedit->type==OB_CURVE);
 		ListBase *nubase= &cu->nurb; //XXX ListBase *nubase = obedit?&editNurb:&cu->nurb;
 		int numVerts;
 
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index 1570f735fc5..c8648e19c2d 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -2668,10 +2668,10 @@ static void write_videoscape_mesh(Object *ob, char *str)
 		}
 		for(a=0; a<me->totface; a++, mface++) {
 			if(mface->v4==0) {
-				fprintf(fp, "3 %d %d %d 0x%x\n", mface->v1, mface->v2, mface->v3, kleur[mface->mat_nr]);
+				fprintf(fp, "3 %d %d %d 0x%x\n", mface->v1, mface->v2, mface->v3, kleur[(int)mface->mat_nr]);
 			}
 			else {
-				fprintf(fp, "4 %d %d %d %d 0x%x\n", mface->v1, mface->v2, mface->v3, mface->v4, kleur[mface->mat_nr]);
+				fprintf(fp, "4 %d %d %d %d 0x%x\n", mface->v1, mface->v2, mface->v3, mface->v4, kleur[(int)mface->mat_nr]);
 			}
 		}
 
@@ -3255,7 +3255,7 @@ static void write_mesh_dxf(FILE *fp, Mesh *me)
 	
 		/* Write a face color */
 		if (me->totcol) {
-			ma= me->mat[mface->mat_nr];
+			ma= me->mat[(int)mface->mat_nr];
 			if(ma) {
 				sprintf(str,"%d",rgb_to_dxf_col(ma->r,ma->g,ma->b));
 				write_group(62, str); /* Color index */
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index de1747e514c..93109b6d0ef 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -583,6 +583,7 @@ void tag_image_time(Image *ima)
 		ima->lastused = (int)PIL_check_seconds_timer();
 }
 
+#if 0
 static void tag_all_images_time() 
 {
 	Image *ima;
@@ -595,6 +596,7 @@ static void tag_all_images_time()
 		}
 	}
 }
+#endif
 
 void free_old_images()
 {