Revision: 41756
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41756
Author: campbellbarton
Date: 2011-11-11 12:00:08 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
quiet -Wdouble-promotion warnings
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenlib/intern/math_matrix.c
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/mesh/editmesh_loop.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_glare.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_levels.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapUV.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
Modified: trunk/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/boids.c 2011-11-11
11:42:29 UTC (rev 41755)
+++ trunk/blender/source/blender/blenkernel/intern/boids.c 2011-11-11
12:00:08 UTC (rev 41756)
@@ -175,7 +175,7 @@
if(len2 > 0.0f && efd.distance - surface < len2) {
len2 = (efd.distance - surface)/len2;
- bbd->wanted_speed *= pow(len2,
boids->landing_smoothness);
+ bbd->wanted_speed *= powf(len2,
boids->landing_smoothness);
}
}
@@ -242,7 +242,7 @@
mul_v3_fl(bbd->wanted_co, (1.0f - t) *
val->personal_space * pa->size);
- bbd->wanted_speed = sqrt(t) *
len_v3(pa->prev_state.vel);
+ bbd->wanted_speed = sqrtf(t) *
len_v3(pa->prev_state.vel);
bbd->wanted_speed = MAX2(bbd->wanted_speed,
val->min_speed);
return 1;
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2011-11-11
11:42:29 UTC (rev 41755)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2011-11-11
12:00:08 UTC (rev 41756)
@@ -1093,7 +1093,7 @@
cloth->verts[spring->kl].spring_count++;
spring->type = CLOTH_SPRING_TYPE_STRUCTURAL;
spring->flags = 0;
- spring->stiffness =
(cloth->verts[spring->kl].struct_stiff + cloth->verts[spring->ij].struct_stiff)
/ 2.0;
+ spring->stiffness =
(cloth->verts[spring->kl].struct_stiff + cloth->verts[spring->ij].struct_stiff)
/ 2.0f;
struct_springs++;
BLI_linklist_prepend ( &cloth->springs, spring );
@@ -1110,7 +1110,7 @@
for(i = 0; i < numverts; i++)
{
- cloth->verts[i].avg_spring_len = cloth->verts[i].avg_spring_len
* 0.49 / ((float)cloth->verts[i].spring_count);
+ cloth->verts[i].avg_spring_len = cloth->verts[i].avg_spring_len
* 0.49f / ((float)cloth->verts[i].spring_count);
}
// shear springs
@@ -1132,7 +1132,7 @@
spring->kl = MAX2(mface[i].v3, mface[i].v1);
spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest,
cloth->verts[spring->ij].xrest);
spring->type = CLOTH_SPRING_TYPE_SHEAR;
- spring->stiffness = (cloth->verts[spring->kl].shear_stiff +
cloth->verts[spring->ij].shear_stiff) / 2.0;
+ spring->stiffness = (cloth->verts[spring->kl].shear_stiff +
cloth->verts[spring->ij].shear_stiff) / 2.0f;
BLI_linklist_append ( &edgelist[spring->ij], spring );
BLI_linklist_append ( &edgelist[spring->kl], spring );
@@ -1195,7 +1195,7 @@
spring->kl = MAX2(tspring2->ij, index2);
spring->restlen =
len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest);
spring->type =
CLOTH_SPRING_TYPE_BENDING;
- spring->stiffness =
(cloth->verts[spring->kl].bend_stiff + cloth->verts[spring->ij].bend_stiff) /
2.0;
+ spring->stiffness =
(cloth->verts[spring->kl].bend_stiff + cloth->verts[spring->ij].bend_stiff) /
2.0f;
BLI_edgehash_insert ( edgehash,
spring->ij, spring->kl, NULL );
bend_springs++;
@@ -1234,7 +1234,7 @@
spring->kl = tspring->kl;
spring->restlen =
len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest);
spring->type = CLOTH_SPRING_TYPE_BENDING;
- spring->stiffness =
(cloth->verts[spring->kl].bend_stiff + cloth->verts[spring->ij].bend_stiff) /
2.0;
+ spring->stiffness =
(cloth->verts[spring->kl].bend_stiff + cloth->verts[spring->ij].bend_stiff) /
2.0f;
bend_springs++;
BLI_linklist_prepend ( &cloth->springs, spring
);
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2011-11-11
11:42:29 UTC (rev 41755)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2011-11-11
12:00:08 UTC (rev 41756)
@@ -464,7 +464,7 @@
d = ( a * c - b * b );
- if ( ABS ( d ) < ALMOST_ZERO )
+ if ( ABS ( d ) < (double)ALMOST_ZERO )
{
*w1 = *w2 = *w3 = 1.0 / 3.0;
return;
@@ -554,14 +554,14 @@
// Decrease in magnitude of relative tangential
velocity due to coulomb friction
// in original formula "magrelVel" should be the
"change of relative velocity in normal direction"
- magtangent = MIN2 ( clmd->coll_parms->friction * 0.01 *
magrelVel,sqrt ( INPR ( vrel_t_pre,vrel_t_pre ) ) );
+ magtangent = MIN2 ( clmd->coll_parms->friction * 0.01f
* magrelVel, sqrtf( INPR ( vrel_t_pre,vrel_t_pre ) ) );
// Apply friction impulse.
if ( magtangent > ALMOST_ZERO )
{
normalize_v3( vrel_t_pre );
- impulse = magtangent / ( 1.0 + w1*w1 + w2*w2 +
w3*w3 ); // 2.0 *
+ impulse = magtangent / ( 1.0f + w1*w1 + w2*w2 +
w3*w3 ); // 2.0 *
VECADDMUL (
cloth1->verts[collpair->ap1].impulse, vrel_t_pre, w1 * impulse );
VECADDMUL (
cloth1->verts[collpair->ap2].impulse, vrel_t_pre, w2 * impulse );
VECADDMUL (
cloth1->verts[collpair->ap3].impulse, vrel_t_pre, w3 * impulse );
@@ -585,17 +585,17 @@
// I_r = -min(dt*kd, m(0,1d/dt - v_n))
spf = (float)clmd->sim_parms->stepsPerFrame /
clmd->sim_parms->timescale;
- d = clmd->coll_parms->epsilon*8.0/9.0 +
epsilon2*8.0/9.0 - collpair->distance;
- if ( ( magrelVel < 0.1*d*spf ) && ( d > ALMOST_ZERO ) )
+ d = clmd->coll_parms->epsilon*8.0f/9.0f +
epsilon2*8.0f/9.0f - collpair->distance;
+ if ( ( magrelVel < 0.1f*d*spf ) && ( d > ALMOST_ZERO ) )
{
- repulse = MIN2 ( d*1.0/spf, 0.1*d*spf -
magrelVel );
+ repulse = MIN2 ( d*1.0f/spf, 0.1f*d*spf -
magrelVel );
// stay on the safe side and clamp repulse
if ( impulse > ALMOST_ZERO )
repulse = MIN2 ( repulse, 5.0*impulse );
repulse = MAX2 ( impulse, repulse );
- impulse = repulse / ( 1.0 + w1*w1 + w2*w2 +
w3*w3 ); // original 2.0 / 0.25
+ impulse = repulse / ( 1.0f + w1*w1 + w2*w2 +
w3*w3 ); // original 2.0 / 0.25
VECADDMUL (
cloth1->verts[collpair->ap1].impulse, collpair->normal, impulse );
VECADDMUL (
cloth1->verts[collpair->ap2].impulse, collpair->normal, impulse );
VECADDMUL (
cloth1->verts[collpair->ap3].impulse, collpair->normal, impulse );
@@ -1492,8 +1492,8 @@
collmd->current_xnew[collpair->bp2].co,
collmd->current_xnew[collpair->bp3].co, &l, 0))
{
- if (l >= 0.0 && l < sdis) {
- mul_v3_fl(n2,
(l-sdis)*cloth->verts[collpair->ap1].mass*dt*clmd->coll_parms->repel_force*0.1);
+ if (l >= 0.0f && l < sdis) {
+ mul_v3_fl(n2,
(l-sdis)*cloth->verts[collpair->ap1].mass*dt*clmd->coll_parms->repel_force*0.1f);
add_v3_v3(cloth->verts[collpair->ap1].tv, n2);
add_v3_v3(cloth->verts[collpair->ap2].tv, n2);
@@ -1507,7 +1507,7 @@
verts1[collpair->ap1].txold,
verts1[collpair->ap2].txold, verts1[collpair->ap3].txold,
collmd->current_x[collpair->bp1].co, collmd->current_x[collpair->bp2].co,
collmd->current_x[collpair->bp3].co, collpair->pa,collpair->pb,collpair->vector
);
#else
// just be sure that we don't add anything
- distance = 2.0 * ( epsilon1 + epsilon2 + ALMOST_ZERO );
+ distance = 2.0 * (double)( epsilon1 + epsilon2 + ALMOST_ZERO );
#endif
if ( distance <= ( epsilon1 + epsilon2 + ALMOST_ZERO ) )
@@ -2534,7 +2534,7 @@
}
else
{
- mul_v3_fl(
temp, -correction*0.5 );
+ mul_v3_fl(
temp, correction * -0.5 );
VECADD (
verts[j].tx, verts[j].tx, temp );
VECSUB (
verts[i].tx, verts[i].tx, temp );
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-11 11:42:29 UTC (rev 41755)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-11 12:00:08 UTC (rev 41756)
@@ -677,7 +677,7 @@
volume = td[0]*td[1]*td[2];
/* determine final grid size by trying to fit average 10.000
points per grid cell */
- dim_factor = pow(volume / ((double)sData->total_points /
10000.f), 1.0f/axis);
+ dim_factor = (float)pow(volume / ((double)sData->total_points /
10000.0), 1.0/(double)axis);
/* define final grid size using dim_factor, use min 3 for
active axises */
for (i=0; i<3; i++) {
@@ -3695,7 +3695,7 @@
else if (surface->type ==
MOD_DPAINT_SURFACE_T_DISPLACE ||
surface->type ==
MOD_DPAINT_SURFACE_T_WAVE) {
/* get displace depth */
- disp_intersect = (1.0f -
sqrt(disp_intersect / radius)) * radius;
+ disp_intersect = (1.0f -
sqrtf(disp_intersect / radius)) * radius;
depth = (radius -
disp_intersect) / bData->bNormal[index].normal_scale;
if (depth<0.0f) depth = 0.0f;
}
@@ -3803,7 +3803,7 @@
else if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE
||
surface->type ==
MOD_DPAINT_SURFACE_T_WAVE) {
/* get displace depth */
- float disp_intersect = (1.0f -
sqrt((brush->paint_distance-distance) / brush->paint_distance)) *
brush->paint_distance;
+ float disp_intersect = (1.0f -
sqrtf((brush->paint_distance-distance) / brush->paint_distance)) *
brush->paint_distance;
depth = (brush->paint_distance -
disp_intersect) / bData->bNormal[index].normal_scale;
if (depth<0.0f) depth = 0.0f;
}
@@ -3863,7 +3863,7 @@
int numOfNeighs = adj_data->n_num[index];
for (i=0; i<numOfNeighs; i++) {
- bData->average_dist +=
bNeighs[adj_data->n_index[index]+i].dist;
+ bData->average_dist +=
(double)bNeighs[adj_data->n_index[index]+i].dist;
}
}
bData->average_dist /= adj_data->total_targets;
@@ -3922,18 +3922,18 @@
/* get drip factor based on force dir in relation to angle
between those neighbours */
temp = dot_v3v3(bNeighs[closest_id[0]].dir, force_proj);
CLAMP(temp, -1.0f, 1.0f); /* float precision might cause values
> 1.0f that return infinite */
- closest_d[1] = acos(temp)/neigh_diff;
+ closest_d[1] = acosf(temp)/neigh_diff;
closest_d[0] = 1.0f - closest_d[1];
/* and multiply depending on how deeply force intersects
surface */
temp = fabs(force_intersect);
CLAMP(temp, 0.0f, 1.0f);
- closest_d[0] *= acos(temp)/1.57079633f;
- closest_d[1] *= acos(temp)/1.57079633f;
+ closest_d[0] *= acosf(temp)/1.57079633f;
+ closest_d[1] *= acosf(temp)/1.57079633f;
}
else {
/* if only single neighbour, still linearize force intersection
effect */
- closest_d[0] = 1.0f - acos(closest_d[0])/1.57079633f;
+ closest_d[0] = 1.0f - acosf(closest_d[0])/1.57079633f;
}
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
