Revision: 18078
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18078
Author: blendix
Date: 2008-12-26 15:19:25 +0100 (Fri, 26 Dec 2008)
Log Message:
-----------
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).
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/BME_tools.c
branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
branches/blender2.5/blender/source/blender/blenkernel/intern/collision.c
branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
branches/blender2.5/blender/source/blender/yafray/intern/export_File.cpp
branches/blender2.5/blender/source/blender/yafray/intern/export_Plugin.cpp
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/BME_tools.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/BME_tools.c
2008-12-26 13:50:32 UTC (rev 18077)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/BME_tools.c
2008-12-26 14:19:25 UTC (rev 18078)
@@ -205,6 +205,7 @@
}
+#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 @@
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){
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
2008-12-26 13:50:32 UTC (rev 18077)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
2008-12-26 14:19:25 UTC (rev 18078)
@@ -954,7 +954,7 @@
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 @@
ob= ob->id.next;
}
- obar[ch]= ob;
+ obar[(int)ch]= ob;
return ob;
}
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/collision.c
2008-12-26 13:50:32 UTC (rev 18077)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/collision.c
2008-12-26 14:19:25 UTC (rev 18078)
@@ -591,7 +591,9 @@
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 );
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
2008-12-26 13:50:32 UTC (rev 18077)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
2008-12-26 14:19:25 UTC (rev 18078)
@@ -1454,7 +1454,7 @@
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;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2008-12-26 13:50:32 UTC (rev 18077)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2008-12-26 14:19:25 UTC (rev 18078)
@@ -2668,10 +2668,10 @@
}
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 @@
/* 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 */
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
2008-12-26 13:50:32 UTC (rev 18077)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
2008-12-26 14:19:25 UTC (rev 18078)
@@ -583,6 +583,7 @@
ima->lastused = (int)PIL_check_seconds_timer();
}
+#if 0
static void tag_all_images_time()
{
Image *ima;
@@ -595,6 +596,7 @@
}
}
}
+#endif
void free_old_images()
{
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2008-12-26 13:50:32 UTC (rev 18077)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2008-12-26 14:19:25 UTC (rev 18078)
@@ -6238,52 +6238,55 @@
if (sl->spacetype==SPACE_BUTS) {
SpaceButs *sbuts= (SpaceButs *)
sl;
-//XXX sbuts->v2d.maxzoom= 1.2f;
-//XXX sbuts->align= 1; /*
horizontal default */
-//XXX
-//XXX if(sbuts->mainb==BUTS_LAMP) {
-//XXX sbuts->mainb=
CONTEXT_SHADING;
-//XXX
sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_LAMP;
-//XXX }
-//XXX else if(sbuts->mainb==BUTS_MAT)
{
-//XXX sbuts->mainb=
CONTEXT_SHADING;
-//XXX
sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_MAT;
-//XXX }
-//XXX else if(sbuts->mainb==BUTS_TEX)
{
-//XXX sbuts->mainb=
CONTEXT_SHADING;
-//XXX
sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_TEX;
-//XXX }
-//XXX else
if(sbuts->mainb==BUTS_ANIM) {
-//XXX sbuts->mainb=
CONTEXT_OBJECT;
-//XXX }
-//XXX else
if(sbuts->mainb==BUTS_WORLD) {
-//XXX sbuts->mainb=
CONTEXT_SCENE;
-//XXX
sbuts->tab[CONTEXT_SCENE]= TAB_SCENE_WORLD;
-//XXX }
-//XXX else
if(sbuts->mainb==BUTS_RENDER) {
-//XXX sbuts->mainb=
CONTEXT_SCENE;
-//XXX
sbuts->tab[CONTEXT_SCENE]= TAB_SCENE_RENDER;
-//XXX }
-//XXX else
if(sbuts->mainb==BUTS_GAME) {
-//XXX sbuts->mainb=
CONTEXT_LOGIC;
-//XXX }
-//XXX else
if(sbuts->mainb==BUTS_FPAINT) {
-//XXX sbuts->mainb=
CONTEXT_EDITING;
-//XXX }
-//XXX else
if(sbuts->mainb==BUTS_RADIO) {
-//XXX sbuts->mainb=
CONTEXT_SHADING;
-//XXX
sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_RAD;
-//XXX }
-//XXX else
if(sbuts->mainb==BUTS_CONSTRAINT) {
-//XXX sbuts->mainb=
CONTEXT_OBJECT;
-//XXX }
-//XXX else
if(sbuts->mainb==BUTS_SCRIPT) {
-//XXX sbuts->mainb=
CONTEXT_OBJECT;
-//XXX }
-//XXX else
if(sbuts->mainb==BUTS_EDIT) {
-//XXX sbuts->mainb=
CONTEXT_EDITING;
-//XXX }
-//XXX else sbuts->mainb=
CONTEXT_SCENE;
+ sbuts->v2d.maxzoom= 1.2f;
+ sbuts->align= 1; /*
horizontal default */
+
+ //XXX
+#if 0
+ if(sbuts->mainb==BUTS_LAMP) {
+ sbuts->mainb=
CONTEXT_SHADING;
+
sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_LAMP;
+ }
+ else if(sbuts->mainb==BUTS_MAT)
{
+ sbuts->mainb=
CONTEXT_SHADING;
+
sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_MAT;
+ }
+ else if(sbuts->mainb==BUTS_TEX)
{
+ sbuts->mainb=
CONTEXT_SHADING;
+
sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_TEX;
+ }
+ else
if(sbuts->mainb==BUTS_ANIM) {
+ sbuts->mainb=
CONTEXT_OBJECT;
+ }
+ else
if(sbuts->mainb==BUTS_WORLD) {
+ sbuts->mainb=
CONTEXT_SCENE;
+
sbuts->tab[CONTEXT_SCENE]= TAB_SCENE_WORLD;
+ }
+ else
if(sbuts->mainb==BUTS_RENDER) {
+ sbuts->mainb=
CONTEXT_SCENE;
+
sbuts->tab[CONTEXT_SCENE]= TAB_SCENE_RENDER;
+ }
+ else
if(sbuts->mainb==BUTS_GAME) {
+ sbuts->mainb=
CONTEXT_LOGIC;
+ }
+ else
if(sbuts->mainb==BUTS_FPAINT) {
+ sbuts->mainb=
CONTEXT_EDITING;
+ }
+ else
if(sbuts->mainb==BUTS_RADIO) {
+ sbuts->mainb=
CONTEXT_SHADING;
+
sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_RAD;
+ }
+ else
if(sbuts->mainb==BUTS_CONSTRAINT) {
+ sbuts->mainb=
CONTEXT_OBJECT;
+ }
+ else
if(sbuts->mainb==BUTS_SCRIPT) {
+ sbuts->mainb=
CONTEXT_OBJECT;
+ }
+ else
if(sbuts->mainb==BUTS_EDIT) {
+ sbuts->mainb=
CONTEXT_EDITING;
+ }
+ else sbuts->mainb=
CONTEXT_SCENE;
+#endif
}
}
}
@@ -8412,7 +8415,6 @@
{
BHead *bhead= blo_firstbhead(fd);
BlendFileData *bfd;
- FileGlobal *fg = (FileGlobal *)NULL;
bfd= MEM_callocN(sizeof(BlendFileData), "blendfiledata");
bfd->main= MEM_callocN(sizeof(Main), "main");
@@ -9343,9 +9345,9 @@
else ob= (Object *)id;
/* XXX use context to find view3d->lay
*/
- if((flag & FILE_ACTIVELAY)) {
- scene->lay;
- }
+ //if((flag & FILE_ACTIVELAY)) {
+ // scene->lay;
+ //}
base->lay= ob->lay;
base->object= ob;
ob->id.us++;
Modified:
branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
2008-12-26 13:50:32 UTC (rev 18077)
+++
branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
2008-12-26 14:19:25 UTC (rev 18078)
@@ -463,7 +463,7 @@
expand= ICON_TRIA_RIGHT;
sel = SEL_OBJC(base);
- sprintf(name, ob->id.name+2);
+ strcpy(name, ob->id.name+2);
}
break;
case ANIMTYPE_FILLACTD: /* action widget */
@@ -480,7 +480,7 @@
expand= ICON_TRIA_RIGHT;
sel = SEL_ACTC(act);
- sprintf(name, "Action");
+ strcpy(name, "Action");
}
break;
case ANIMTYPE_FILLIPOD: /* ipo (dopesheet)
expand widget */
@@ -497,7 +497,7 @@
expand = ICON_TRIA_RIGHT;
//sel = SEL_OBJC(base);
- sprintf(name, "IPO Curves");
+ strcpy(name, "IPO Curves");
}
break;
case ANIMTYPE_FILLCOND: /* constraint channels
(dopesheet) expand widget */
@@ -514,7 +514,7 @@
expand = ICON_TRIA_RIGHT;
//sel = SEL_OBJC(base);
- sprintf(name, "Constraints");
+ strcpy(name, "Constraints");
}
break;
case ANIMTYPE_FILLMATD: /* object materials
(dopesheet) expand widget */
@@ -530,7 +530,7 @@
else
expand = ICON_TRIA_RIGHT;
- sprintf(name, "Materials");
+ strcpy(name, "Materials");
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
