[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39558] trunk/blender/source/blender: warning cleanup for -Wdouble-promotion
Campbell Barton
ideasman42 at gmail.com
Fri Aug 19 18:21:30 CEST 2011
Revision: 39558
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39558
Author: campbellbarton
Date: 2011-08-19 16:21:29 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
warning cleanup for -Wdouble-promotion
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenlib/intern/jitter.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/blenlib/intern/rct.c
trunk/blender/source/blender/blenlib/intern/scanfill.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
trunk/blender/source/blender/render/intern/source/volumetric.c
trunk/blender/source/blender/render/intern/source/voxeldata.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2011-08-19 15:38:11 UTC (rev 39557)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2011-08-19 16:21:29 UTC (rev 39558)
@@ -923,7 +923,7 @@
for(i = 0; i < dm->getNumVerts(dm); i++)
{
- maxdist = MAX2(maxdist, clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len*2.0));
+ maxdist = MAX2(maxdist, clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len*2.0f));
}
clmd->clothObject->bvhselftree = bvhselftree_build_from_cloth ( clmd, maxdist );
Modified: trunk/blender/source/blender/blenlib/intern/jitter.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/jitter.c 2011-08-19 15:38:11 UTC (rev 39557)
+++ trunk/blender/source/blender/blenlib/intern/jitter.c 2011-08-19 16:21:29 UTC (rev 39558)
@@ -53,10 +53,10 @@
y = jit1[i+1];
for (j = 2*num-2; j>=0 ; j-=2) {
if (i != j){
- vecx = jit1[j] - x - 1.0;
- vecy = jit1[j+1] - y - 1.0;
+ vecx = jit1[j] - x - 1.0f;
+ vecy = jit1[j+1] - y - 1.0f;
for (k = 3; k>0 ; k--){
- if( fabs(vecx)<rad1 && fabs(vecy)<rad1) {
+ if( fabsf(vecx)<rad1 && fabsf(vecy)<rad1) {
len= sqrt(vecx*vecx + vecy*vecy);
if(len>0 && len<rad1) {
len= len/rad1;
@@ -64,9 +64,9 @@
dvecy += vecy/len;
}
}
- vecx += 1.0;
+ vecx += 1.0f;
- if( fabs(vecx)<rad1 && fabs(vecy)<rad1) {
+ if( fabsf(vecx)<rad1 && fabsf(vecy)<rad1) {
len= sqrt(vecx*vecx + vecy*vecy);
if(len>0 && len<rad1) {
len= len/rad1;
@@ -74,9 +74,9 @@
dvecy += vecy/len;
}
}
- vecx += 1.0;
+ vecx += 1.0f;
- if( fabs(vecx)<rad1 && fabs(vecy)<rad1) {
+ if( fabsf(vecx)<rad1 && fabsf(vecy)<rad1) {
len= sqrt(vecx*vecx + vecy*vecy);
if(len>0 && len<rad1) {
len= len/rad1;
@@ -84,16 +84,16 @@
dvecy += vecy/len;
}
}
- vecx -= 2.0;
- vecy += 1.0;
+ vecx -= 2.0f;
+ vecy += 1.0f;
}
}
}
- x -= dvecx/18.0 ;
- y -= dvecy/18.0;
- x -= floor(x) ;
- y -= floor(y);
+ x -= dvecx/18.0f;
+ y -= dvecy/18.0f;
+ x -= floorf(x) ;
+ y -= floorf(y);
jit2[i] = x;
jit2[i+1] = y;
}
@@ -111,28 +111,28 @@
y = jit1[i+1];
for (j =2*num -2; j>= 0 ; j-=2){
if (i != j){
- vecx = jit1[j] - x - 1.0;
- vecy = jit1[j+1] - y - 1.0;
+ vecx = jit1[j] - x - 1.0f;
+ vecy = jit1[j+1] - y - 1.0f;
- if( fabs(vecx)<rad2) dvecx+= vecx*rad2;
- vecx += 1.0;
- if( fabs(vecx)<rad2) dvecx+= vecx*rad2;
- vecx += 1.0;
- if( fabs(vecx)<rad2) dvecx+= vecx*rad2;
+ if( fabsf(vecx)<rad2) dvecx+= vecx*rad2;
+ vecx += 1.0f;
+ if( fabsf(vecx)<rad2) dvecx+= vecx*rad2;
+ vecx += 1.0f;
+ if( fabsf(vecx)<rad2) dvecx+= vecx*rad2;
- if( fabs(vecy)<rad2) dvecy+= vecy*rad2;
- vecy += 1.0;
- if( fabs(vecy)<rad2) dvecy+= vecy*rad2;
- vecy += 1.0;
- if( fabs(vecy)<rad2) dvecy+= vecy*rad2;
+ if( fabsf(vecy)<rad2) dvecy+= vecy*rad2;
+ vecy += 1.0f;
+ if( fabsf(vecy)<rad2) dvecy+= vecy*rad2;
+ vecy += 1.0f;
+ if( fabsf(vecy)<rad2) dvecy+= vecy*rad2;
}
}
- x -= dvecx/2 ;
- y -= dvecy/2;
- x -= floor(x) ;
- y -= floor(y);
+ x -= dvecx/2.0f;
+ y -= dvecy/2.0f;
+ x -= floorf(x) ;
+ y -= floorf(y);
jit2[i] = x;
jit2[i+1] = y;
}
@@ -148,17 +148,17 @@
if(num==0) return;
jit2= MEM_mallocN(12 + 2*sizeof(float)*num, "initjit");
- rad1= 1.0/sqrt((float)num);
- rad2= 1.0/((float)num);
- rad3= sqrt((float)num)/((float)num);
+ rad1= 1.0f/sqrtf((float)num);
+ rad2= 1.0f/((float)num);
+ rad3= sqrtf((float)num)/((float)num);
BLI_srand(31415926 + num);
x= 0;
for(i=0; i<2*num; i+=2) {
- jitarr[i]= x+ rad1*(0.5-BLI_drand());
- jitarr[i+1]= ((float)i/2)/num +rad1*(0.5-BLI_drand());
+ jitarr[i]= x+ rad1*(float)(0.5-BLI_drand());
+ jitarr[i+1]= ((float)i/2)/num +rad1*(float)(0.5-BLI_drand());
x+= rad3;
- x -= floor(x);
+ x -= floorf(x);
}
for (i=0 ; i<24 ; i++) {
@@ -171,8 +171,8 @@
/* finally, move jittertab to be centered around (0,0) */
for(i=0; i<2*num; i+=2) {
- jitarr[i] -= 0.5;
- jitarr[i+1] -= 0.5;
+ jitarr[i] -= 0.5f;
+ jitarr[i+1] -= 0.5f;
}
}
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-08-19 15:38:11 UTC (rev 39557)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-08-19 16:21:29 UTC (rev 39558)
@@ -402,7 +402,7 @@
madd_v3_v3v3fl(r_p1, l1, ldir, mu);
return 1;
}
- else if (i > 0.0) {
+ else if (i > 0.0f) {
const float i_sqrt= sqrt(i); /* avoid calc twice */
/* first intersection */
@@ -456,7 +456,7 @@
madd_v2_v2v2fl(r_p1, l1, ldir, mu);
return 1;
}
- else if (i > 0.0) {
+ else if (i > 0.0f) {
const float i_sqrt= sqrt(i); /* avoid calc twice */
/* first intersection */
@@ -2010,7 +2010,7 @@
}
if(IS_ZERO(denom)==0)
- uv[1]= (float) (( (1-uv[0])*(st0[i]-st[i]) + uv[0]*(st1[i]-st[i]) ) / denom);
+ uv[1]= (float) (( (1.0f-uv[0])*(st0[i]-st[i]) + uv[0]*(st1[i]-st[i]) ) / denom);
}
}
Modified: trunk/blender/source/blender/blenlib/intern/math_rotation.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_rotation.c 2011-08-19 15:38:11 UTC (rev 39557)
+++ trunk/blender/source/blender/blenlib/intern/math_rotation.c 2011-08-19 16:21:29 UTC (rev 39558)
@@ -213,7 +213,7 @@
double q0, q1, q2, q3, qda,qdb,qdc,qaa,qab,qac,qbb,qbc,qcc;
#ifdef DEBUG
- if(!((q0=dot_qtqt(q, q))==0.0f || (fabsf(q0-1.0f) < (float)QUAT_EPSILON))) {
+ if(!((q0=dot_qtqt(q, q))==0.0f || (fabs(q0-1.0) < QUAT_EPSILON))) {
fprintf(stderr, "Warning! quat_to_mat4() called with non-normalized: size %.8f *** report a bug ***\n", (float)q0);
}
#endif
@@ -492,8 +492,8 @@
else angle= (float)(-0.5*atan2(-fp[0], -fp[1]));
}
- co= (float)cos(angle);
- si= (float)(sin(angle)/len1);
+ co= cosf(angle);
+ si= sinf(angle)/len1;
q2[0]= co;
q2[1]= x2*si;
q2[2]= y2*si;
Modified: trunk/blender/source/blender/blenlib/intern/rct.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/rct.c 2011-08-19 15:38:11 UTC (rev 39557)
+++ trunk/blender/source/blender/blenlib/intern/rct.c 2011-08-19 16:21:29 UTC (rev 39558)
@@ -233,10 +233,10 @@
void BLI_copy_rcti_rctf(rcti *tar, const rctf *src)
{
- tar->xmin= floor(src->xmin + 0.5);
- tar->xmax= floor((src->xmax - src->xmin) + 0.5);
- tar->ymin= floor(src->ymin + 0.5);
- tar->ymax= floor((src->ymax - src->ymin) + 0.5);
+ tar->xmin= floor(src->xmin + 0.5f);
+ tar->xmax= floor((src->xmax - src->xmin) + 0.5f);
+ tar->ymin= floor(src->ymin + 0.5f);
+ tar->ymax= floor((src->ymax - src->ymin) + 0.5f);
}
void print_rctf(const char *str, rctf *rect)
Modified: trunk/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/scanfill.c 2011-08-19 15:38:11 UTC (rev 39557)
+++ trunk/blender/source/blender/blenlib/intern/scanfill.c 2011-08-19 16:21:29 UTC (rev 39558)
@@ -288,7 +288,7 @@
inp= (v2[cox]-v1[cox])*(v1[coy]-v3[coy])
+(v1[coy]-v2[coy])*(v1[cox]-v3[cox]);
- if(inp<0.0) return 0;
+ if(inp < 0.0f) return 0;
else if(inp==0) {
if(v1[cox]==v3[cox] && v1[coy]==v3[coy]) return 0;
if(v2[cox]==v3[cox] && v2[coy]==v3[coy]) return 0;
@@ -312,8 +312,8 @@
y= eed->v1->co[coy];
fac1= eed->v2->co[coy]-y;
- if(fac1==0.0) {
- fac1= 1.0e10*(eed->v2->co[cox]-x);
+ if(fac1==0.0f) {
+ fac1= 1.0e10f*(eed->v2->co[cox]-x);
}
else fac1= (x-eed->v2->co[cox])/fac1;
@@ -324,8 +324,8 @@
if(ed->v2==eed->v2) return 0;
fac= ed->v2->co[coy]-y;
- if(fac==0.0) {
- fac= 1.0e10*(ed->v2->co[cox]-x);
+ if(fac==0.0f) {
+ fac= 1.0e10f*(ed->v2->co[cox]-x);
}
else fac= (x-ed->v2->co[cox])/fac;
@@ -443,7 +443,7 @@
vec2[1]= eed->v2->co[coy];
if(boundinsideEV(eed,eve)) {
dist= dist_to_line_v2(vec1,vec2,vec3);
- if(dist<COMPLIMIT) {
+ if(dist<(float)COMPLIMIT) {
/* new edge */
ed1= BLI_addfilledge(eed->v1, eve);
@@ -816,7 +816,7 @@
if(v2) {
if( compare_v3v3(v2, eve->co, COMPLIMIT)==0) {
len= normal_tri_v3( norm,v1, v2, eve->co);
- if(len != 0.0) break;
+ if(len != 0.0f) break;
}
}
else if(compare_v3v3(v1, eve->co, COMPLIMIT)==0) {
@@ -825,7 +825,7 @@
eve= eve->next;
}
- if(len==0.0) return 0; /* no fill possible */
+ if(len==0.0f) return 0; /* no fill possible */
norm[0]= fabs(norm[0]);
norm[1]= fabs(norm[1]);
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c 2011-08-19 15:38:11 UTC (rev 39557)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c 2011-08-19 16:21:29 UTC (rev 39558)
@@ -180,7 +180,7 @@
glEnable(GL_BLEND);
glGetFloatv(GL_CURRENT_COLOR, color);
- color[3]*= 0.125;
+ color[3] *= 0.125f;
glColor4fv(color);
/* for each AA step */
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2011-08-19 15:38:11 UTC (rev 39557)
+++ trunk/blender/source/blender/editors/object/object_add.c 2011-08-19 16:21:29 UTC (rev 39558)
@@ -182,7 +182,7 @@
}
RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "Location for the newly added object", -FLT_MAX, FLT_MAX);
- RNA_def_float_rotation(ot->srna, "rotation", 3, NULL, -FLT_MAX, FLT_MAX, "Rotation", "Rotation for the newly added object", -M_PI * 2.0f, M_PI * 2.0f);
+ RNA_def_float_rotation(ot->srna, "rotation", 3, NULL, -FLT_MAX, FLT_MAX, "Rotation", "Rotation for the newly added object", (float)-M_PI * 2.0f, (float)M_PI * 2.0f);
prop = RNA_def_boolean_layer_member(ot->srna, "layers", 20, NULL, "Layer", "");
RNA_def_property_flag(prop, PROP_HIDDEN);
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list