[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13858] trunk/blender/source/blender: Purge of compiler warnings (number 2):
Joshua Leung
aligorith at gmail.com
Mon Feb 25 05:39:10 CET 2008
Revision: 13858
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13858
Author: aligorith
Date: 2008-02-25 05:38:48 +0100 (Mon, 25 Feb 2008)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/BME_tools.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/python/api2_2x/Draw.c
trunk/blender/source/blender/src/radialcontrol.c
trunk/blender/source/blender/src/sculptmode.c
trunk/blender/source/blender/src/transform_conversions.c
Modified: trunk/blender/source/blender/blenkernel/intern/BME_tools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2008-02-25 02:34:09 UTC (rev 13857)
+++ trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2008-02-25 04:38:48 UTC (rev 13858)
@@ -653,7 +653,7 @@
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;
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2008-02-25 02:34:09 UTC (rev 13857)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2008-02-25 04:38:48 UTC (rev 13858)
@@ -1066,7 +1066,6 @@
{
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 @@
// 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 @@
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 @@
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;
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2008-02-25 02:34:09 UTC (rev 13857)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2008-02-25 04:38:48 UTC (rev 13858)
@@ -2009,9 +2009,9 @@
/* 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 @@
/* 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
}
+#if 0
static void softbody_store_step(Object *ob)
{
SoftBody *sb= ob->soft; /* is supposed to be there*/
@@ -2611,6 +2612,7 @@
pp+=3;
}
}
+#endif
/* care for bodypoints taken out of the 'ordinary' solver step
Modified: trunk/blender/source/blender/python/api2_2x/Draw.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Draw.c 2008-02-25 02:34:09 UTC (rev 13857)
+++ trunk/blender/source/blender/python/api2_2x/Draw.c 2008-02-25 04:38:48 UTC (rev 13858)
@@ -881,7 +881,7 @@
{
/*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();
Modified: trunk/blender/source/blender/src/radialcontrol.c
===================================================================
--- trunk/blender/source/blender/src/radialcontrol.c 2008-02-25 02:34:09 UTC (rev 13857)
+++ trunk/blender/source/blender/src/radialcontrol.c 2008-02-25 04:38:48 UTC (rev 13858)
@@ -197,7 +197,7 @@
void radialcontrol_draw(RadialControl *rc)
{
- short r1, r2, r3;
+ short r1=200, r2=200, r3=200;
float angle = 0;
if(rc && rc->mode) {
Modified: trunk/blender/source/blender/src/sculptmode.c
===================================================================
--- trunk/blender/source/blender/src/sculptmode.c 2008-02-25 02:34:09 UTC (rev 13857)
+++ trunk/blender/source/blender/src/sculptmode.c 2008-02-25 04:38:48 UTC (rev 13858)
@@ -1191,7 +1191,7 @@
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;
Modified: trunk/blender/source/blender/src/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/src/transform_conversions.c 2008-02-25 02:34:09 UTC (rev 13857)
+++ trunk/blender/source/blender/src/transform_conversions.c 2008-02-25 04:38:48 UTC (rev 13858)
@@ -1967,7 +1967,7 @@
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);
More information about the Bf-blender-cvs
mailing list