From 3023458aa7319a100cfb248a3ace72de5f854670 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Mon, 25 Feb 2008 04:38:48 +0000 Subject: Purge of compiler warnings (number 2): * initial values I added in radialcontrol.c might need to be reviewed if they cause problems(I used 200, as it seems many tools were setting that) * #pragma warnings are the only warnings I still get, so that means we have a clean slate again --- source/blender/blenkernel/intern/BME_tools.c | 2 +- source/blender/blenkernel/intern/implicit.c | 6 ------ source/blender/blenkernel/intern/softbody.c | 32 +++++++++++++++------------- source/blender/python/api2_2x/Draw.c | 2 +- source/blender/src/radialcontrol.c | 2 +- source/blender/src/sculptmode.c | 2 +- source/blender/src/transform_conversions.c | 2 +- 7 files changed, 22 insertions(+), 26 deletions(-) diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c index 855daec8143..5e1b93129a9 100644 --- a/source/blender/blenkernel/intern/BME_tools.c +++ b/source/blender/blenkernel/intern/BME_tools.c @@ -653,7 +653,7 @@ BME_Vert *BME_bevel_wire(BME_Mesh *bm, BME_Vert *v, float value, int res, int op BME_Loop *BME_bevel_edge(BME_Mesh *bm, BME_Loop *l, float value, int options, float *up_vec, BME_TransData_Head *td) { BME_Vert *v1, *v2, *kv; - BME_Loop *kl, *nl; + BME_Loop *kl=NULL, *nl; BME_Edge *e; BME_Poly *f; diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index bde56bb5fe1..da0bed50592 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -1066,7 +1066,6 @@ int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fma { unsigned int numverts = lA[0].vcount, iterations = 0, conjgrad_looplimit=100; float delta0 = 0, deltaNew = 0, deltaOld = 0, alpha = 0, tol = 0; - float conjgrad_epsilon=0.0001; // 0.2 is dt for steps=5 lfVector *r = create_lfvector(numverts); lfVector *p = create_lfvector(numverts); lfVector *s = create_lfvector(numverts); @@ -1172,7 +1171,6 @@ DO_INLINE void dfdx_spring_type1(float to[3][3], float extent[3], float length, // return (outerprod(dir,dir)*k + (I - outerprod(dir,dir))*(k - ((k*L)/length))); float temp[3][3]; float temp1 = k*(1.0 - (L/length)); - float t[3][3]; mul_fvectorT_fvectorS(temp, extent, extent, 1.0 / dot); sub_fmatrix_fmatrix(to, I, temp); @@ -1241,7 +1239,6 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, float stretch_force[3] = {0,0,0}; float bending_force[3] = {0,0,0}; float damping_force[3] = {0,0,0}; - float goal_force[3] = {0,0,0}; float nulldfdx[3][3]={ {0,0,0}, {0,0,0}, {0,0,0}}; float scaling = 0.0; @@ -1435,12 +1432,9 @@ void cloth_calc_force(ClothModifierData *clmd, lfVector *lF, lfVector *lX, lfVec float spring_air = clmd->sim_parms->Cvi * 0.01f; /* viscosity of air scaled in percent */ float gravity[3]; float tm2[3][3] = {{-spring_air,0,0}, {0,-spring_air,0},{0,0,-spring_air}}; - ClothVertex *verts = cloth->verts; MFace *mfaces = cloth->mfaces; float wind_normalized[3]; unsigned int numverts = cloth->numverts; - float auxvect[3], velgoal[3], tvect[3]; - float kd, ks; LinkNode *search = cloth->springs; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 11d4a37f976..834e5fad3dd 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -2009,9 +2009,9 @@ static void sb_spring_force(Object *ob,int bpi,BodySpring *bs,float iks,float fo /* do jacobian stuff if needed */ if(nl_flags & NLF_BUILD){ - int op =3*sb->totpoint; - float mvel = -forcetime*kd; - float mpos = -forcetime*forcefactor; + //int op =3*sb->totpoint; + //float mvel = -forcetime*kd; + //float mpos = -forcetime*forcefactor; /* depending on my pos */ // dfdx_spring(ia,ia,op,dir,bs->len,distance,-mpos); /* depending on my vel */ @@ -2076,8 +2076,8 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int /* clear forces accumulator */ bp->force[0]= bp->force[1]= bp->force[2]= 0.0; if(nl_flags & NLF_BUILD){ - int ia =3*(sb->totpoint-a); - int op =3*sb->totpoint; + //int ia =3*(sb->totpoint-a); + //int op =3*sb->totpoint; /* dF/dV = v */ /* jacobioan nlMatrixAdd(op+ia,ia,-forcetime); @@ -2138,11 +2138,11 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int Vec3PlusStVec(bp->force,sb->balldamp,dvel); if(nl_flags & NLF_BUILD){ - int ia =3*(sb->totpoint-a); - int ic =3*(sb->totpoint-c); - int op =3*sb->totpoint; - float mvel = forcetime*sb->nodemass*sb->balldamp; - float mpos = forcetime*tune*(1.0f-sb->balldamp); + //int ia =3*(sb->totpoint-a); + //int ic =3*(sb->totpoint-c); + //int op =3*sb->totpoint; + //float mvel = forcetime*sb->nodemass*sb->balldamp; + //float mpos = forcetime*tune*(1.0f-sb->balldamp); /*some quick and dirty entries to the jacobian*/ //dfdx_goal(ia,ia,op,mpos); //dfdv_goal(ia,ia,mvel); @@ -2189,8 +2189,8 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int bp->force[2]+= -ks*(auxvect[2]); if(nl_flags & NLF_BUILD){ - int ia =3*(sb->totpoint-a); - int op =3*(sb->totpoint); + //int ia =3*(sb->totpoint-a); + //int op =3*(sb->totpoint); /* depending on my pos */ //dfdx_goal(ia,ia,op,ks*forcetime); } @@ -2206,7 +2206,7 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int bp->force[1]-= kd * (auxvect[1]); bp->force[2]-= kd * (auxvect[2]); if(nl_flags & NLF_BUILD){ - int ia =3*(sb->totpoint-a); + //int ia =3*(sb->totpoint-a); Normalize(auxvect); /* depending on my vel */ //dfdv_goal(ia,ia,kd*forcetime); @@ -2256,7 +2256,7 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int bp->force[2]-= bp->vec[2]*kd; /* friction in media done */ if(nl_flags & NLF_BUILD){ - int ia =3*(sb->totpoint-a); + //int ia =3*(sb->totpoint-a); /* da/dv = */ // nlMatrixAdd(ia,ia,forcetime*kd); @@ -2410,7 +2410,7 @@ static void softbody_apply_forces(Object *ob, float forcetime, int mode, float * SoftBody *sb= ob->soft; /* is supposed to be there */ BodyPoint *bp; float dx[3],dv[3],aabbmin[3],aabbmax[3],cm[3]={0.0f,0.0f,0.0f}; - float timeovermass,freezeloc=0.00001f,freezeforce=0.00000000001f; + float timeovermass/*,freezeloc=0.00001f,freezeforce=0.00000000001f*/; float maxerrpos= 0.0f,maxerrvel = 0.0f; int a,fuzzy=0; @@ -2540,6 +2540,7 @@ static void softbody_restore_prev_step(Object *ob) } } +#if 0 static void softbody_store_step(Object *ob) { SoftBody *sb= ob->soft; /* is supposed to be there*/ @@ -2611,6 +2612,7 @@ static void softbody_swap_state(Object *ob,float *ppos,float *pvel) pp+=3; } } +#endif /* care for bodypoints taken out of the 'ordinary' solver step diff --git a/source/blender/python/api2_2x/Draw.c b/source/blender/python/api2_2x/Draw.c index a5c14edc7aa..284a6d92ba2 100644 --- a/source/blender/python/api2_2x/Draw.c +++ b/source/blender/python/api2_2x/Draw.c @@ -881,7 +881,7 @@ void BPy_Free_DrawButtonsList(void) { /*Clear the list.*/ if (M_Button_List) { - PyGILState_STATE gilstate; + PyGILState_STATE gilstate = {0}; int py_is_on = Py_IsInitialized(); if (py_is_on) gilstate = PyGILState_Ensure(); diff --git a/source/blender/src/radialcontrol.c b/source/blender/src/radialcontrol.c index 5e44d28f08f..404aac225c6 100644 --- a/source/blender/src/radialcontrol.c +++ b/source/blender/src/radialcontrol.c @@ -197,7 +197,7 @@ static void rot_line(const short o[2], const float ang) void radialcontrol_draw(RadialControl *rc) { - short r1, r2, r3; + short r1=200, r2=200, r3=200; float angle = 0; if(rc && rc->mode) { diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c index 039b43efefb..3fda71bf828 100644 --- a/source/blender/src/sculptmode.c +++ b/source/blender/src/sculptmode.c @@ -1191,7 +1191,7 @@ void init_brushaction(BrushAction *a, short *mouse, short *pr_mouse) int i; const char flip = (get_qual() == LR_SHIFTKEY); const char anchored = sculptmode_brush()->flag & SCULPT_BRUSH_ANCHORED; - short orig_mouse[2], dx, dy; + short orig_mouse[2], dx=0, dy=0; a->flip = flip; a->symm.index = 0; diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c index 0266614da28..c0e4b1e36f5 100644 --- a/source/blender/src/transform_conversions.c +++ b/source/blender/src/transform_conversions.c @@ -1967,7 +1967,7 @@ void createTransBMeshVerts(TransInfo *t, BME_Mesh *bm, BME_TransData_Head *td) { tob = t->data = MEM_callocN(td->len*sizeof(TransData), "TransObData(Bevel tool)"); for (i=0,v=bm->verts.first;v;v=v->next) { - if (vtd = BME_get_transdata(td,v)) { + if ( (vtd = BME_get_transdata(td,v)) ) { tob->loc = vtd->loc; tob->val = &vtd->factor; VECCOPY(tob->iloc,vtd->co); -- cgit v1.2.3