[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46247] trunk/blender/source/blender: code cleanup: double promotion & some style cleanup
Campbell Barton
ideasman42 at gmail.com
Thu May 3 23:35:04 CEST 2012
Revision: 46247
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46247
Author: campbellbarton
Date: 2012-05-03 21:35:04 +0000 (Thu, 03 May 2012)
Log Message:
-----------
code cleanup: double promotion & some style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
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_select.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_input.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesdna/DNA_image_types.h
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blender/modifiers/intern/MOD_hook.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
trunk/blender/source/blender/modifiers/intern/MOD_warp.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -586,7 +586,7 @@
b = m1->b - m2->b;
a = m1->a - m2->a;
- return r*r + g*g + b*b + a*a < 0.001;
+ return r * r + g * g + b * b + a * a < 0.001f;
}
static void layerMultiply_mloopcol(void *data, float fac)
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -2014,7 +2014,7 @@
for (i=0; i<tot; i++, disps += side*side, ld++) {
ld->totdisp = side*side;
- ld->level = (int)(logf(side - 1.0f) / M_LN2) + 1;
+ ld->level = (int)(logf(side - 1.0f) / (float)M_LN2) + 1;
if (ld->disps)
MEM_freeN(ld->disps);
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -4096,7 +4096,7 @@
float dir[3];
sub_v3_v3v3(dir, ebone->head, ebone->tail);
- if (angle_v3v3(dir_act, dir) / M_PI < thresh) {
+ if (angle_v3v3(dir_act, dir) / (float)M_PI < thresh) {
ED_armature_edit_bone_select(ebone);
}
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -475,7 +475,7 @@
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, &view_aligned);
if (!view_aligned)
- rot[0] += M_PI / 2.0f;
+ rot[0] += (float)M_PI / 2.0f;
make_prim_init(C, "Monkey", &dia, mat, &state, loc, rot, layer);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -1412,7 +1412,7 @@
float co[3], cageco[3], sco[3], maxdist = knife_snap_size(kcd, kcd->ethresh);
if (kcd->ignore_vert_snapping)
- maxdist *= 0.5;
+ maxdist *= 0.5f;
f = knife_find_closest_face(kcd, co, cageco, NULL);
*is_space = !f;
@@ -1502,7 +1502,7 @@
float co[3], cageco[3], sco[3], maxdist = knife_snap_size(kcd, kcd->vthresh);
if (kcd->ignore_vert_snapping)
- maxdist *= 0.5;
+ maxdist *= 0.5f;
f = knife_find_closest_face(kcd, co, cageco, is_space);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -1129,7 +1129,7 @@
/* but is biased to give higher values to sharp turns, so that it will take
* paths with fewer "turns" when selecting between equal-weighted paths between
* the two edges */
- cost = cost + 0.5f * cost * (2.0f - sqrt(fabs(dot_v3v3(d1, d2))));
+ cost = cost + 0.5f * cost * (2.0f - sqrtf(fabsf(dot_v3v3(d1, d2))));
return cost;
}
@@ -2294,7 +2294,7 @@
float sharp = RNA_float_get(op->ptr, "sharpness");
int i;
- sharp = (sharp * M_PI) / 180.0;
+ sharp = (sharp * (float)M_PI) / 180.0f;
BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
BM_elem_flag_disable(f, BM_ELEM_TAG);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_slide.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -279,7 +279,7 @@
/* Get 3d view */
View3D *view3d = CTX_wm_view3d(C);
const float outline_w = UI_GetThemeValuef(TH_OUTLINE_WIDTH) + 0.8f;
- const float pt_size = UI_GetThemeValuef(TH_FACEDOT_SIZE) + 1.5;
+ const float pt_size = UI_GetThemeValuef(TH_FACEDOT_SIZE) + 1.5f;
int i = 0;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -2346,7 +2346,7 @@
if (!BM_elem_flag_test(ev, BM_ELEM_HIDDEN)) {
switch (mode) {
case -1: /* aligned */
- if (fabs(ev->co[axis] - value) < limit)
+ if (fabsf(ev->co[axis] - value) < limit)
BM_vert_select_set(em->bm, ev, TRUE);
break;
case 0: /* neg */
@@ -2593,21 +2593,21 @@
m1 = MAXSLOPE;
b1 = x12;
}
- x2max = MAX2(x21, x22) + 0.001; /* prevent missed edges */
- x2min = MIN2(x21, x22) - 0.001; /* due to round off error */
- y2max = MAX2(y21, y22) + 0.001;
- y2min = MIN2(y21, y22) - 0.001;
+ x2max = MAX2(x21, x22) + 0.001f; /* prevent missed edges */
+ x2min = MIN2(x21, x22) - 0.001f; /* due to round off error */
+ y2max = MAX2(y21, y22) + 0.001f;
+ y2min = MIN2(y21, y22) - 0.001f;
/* Found an intersect, calc intersect point */
if (m1 == m2) { /* co-incident lines */
/* cut at 50% of overlap area */
x1max = MAX2(x11, x12);
x1min = MIN2(x11, x12);
- xi = (MIN2(x2max, x1max) + MAX2(x2min, x1min)) / 2.0;
+ xi = (MIN2(x2max, x1max) + MAX2(x2min, x1min)) / 2.0f;
y1max = MAX2(y11, y12);
y1min = MIN2(y11, y12);
- yi = (MIN2(y2max, y1max) + MAX2(y2min, y1min)) / 2.0;
+ yi = (MIN2(y2max, y1max) + MAX2(y2min, y1min)) / 2.0f;
}
else if (m2 == MAXSLOPE) {
xi = x22;
@@ -4034,7 +4034,7 @@
if (tex->type == TEX_STUCCI) {
float b2, vec[3];
- float ofs = tex->turbul / 200.0;
+ float ofs = tex->turbul / 200.0f;
BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
b2 = BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1], eve->co[2]);
@@ -4121,7 +4121,7 @@
w[i] = s;
ftot += s;
- df *= 2.0;
+ df *= 2.0f;
}
mul_vn_fl(w, recursion, 1.0f / (float)ftot);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -671,7 +671,7 @@
sub_v2_v2v2(uvdiff, uv2, uv);
- if (fabs(uvdiff[0]) < limit[0] && fabs(uvdiff[1]) < limit[1]) {
+ if (fabsf(uvdiff[0]) < limit[0] && fabsf(uvdiff[1]) < limit[1]) {
if (lastv) lastv->next = next;
else vlist = next;
iterv->next = newvlist;
Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -275,11 +275,11 @@
else if (len > 2) {
float fac = 0.0f, dfac = 1.0f / (float)len;
- dfac *= M_PI * 2;
+ dfac *= (float)M_PI * 2.0f;
for (i = 0; i < len; i++) {
- fuvs[i][0] = 0.5f * sin(fac) + 0.5f;
- fuvs[i][1] = 0.5f * cos(fac) + 0.5f;
+ fuvs[i][0] = 0.5f * sinf(fac) + 0.5f;
+ fuvs[i][1] = 0.5f * cosf(fac) + 0.5f;
fac += dfac;
}
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -1257,7 +1257,7 @@
int i, dvert_tot = 0;
const int def_nr = ob->actdef - 1;
- BLI_assert(fac >= 0.0 && fac <= 1.0f);
+ BLI_assert(fac >= 0.0f && fac <= 1.0f);
if (ob->type != OB_MESH) {
return;
Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/screen/area.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -172,8 +172,8 @@
int dx = x2 - x1;
int dy = y2 - y1;
- dx= copysign(ceil(0.3f*fabs(dx)), dx);
- dy= copysign(ceil(0.3f*fabs(dy)), dy);
+ dx = copysign(ceilf(0.3f * fabsf(dx)), dx);
+ dy = copysign(ceilf(0.3f * fabsf(dy)), dy);
glEnable(GL_BLEND);
glEnable(GL_LINE_SMOOTH);
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c 2012-05-03 21:32:49 UTC (rev 46246)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c 2012-05-03 21:35:04 UTC (rev 46247)
@@ -207,8 +207,8 @@
float strength;
strength = alpha * brush_curve_strength(brush, sqrt(dist), radius_root);
- sculptdata->uv[i].uv[0] = (1.0 - strength) * sculptdata->uv[i].uv[0] + strength * (tmp_uvdata[i].p[0] - 0.5f * (tmp_uvdata[i].b[0] + tmp_uvdata[i].sum_b[0] / tmp_uvdata[i].ncounter));
- sculptdata->uv[i].uv[1] = (1.0 - strength) * sculptdata->uv[i].uv[1] + strength * (tmp_uvdata[i].p[1] - 0.5f * (tmp_uvdata[i].b[1] + tmp_uvdata[i].sum_b[1] / tmp_uvdata[i].ncounter));
+ sculptdata->uv[i].uv[0] = (1.0f - strength) * sculptdata->uv[i].uv[0] + strength * (tmp_uvdata[i].p[0] - 0.5f * (tmp_uvdata[i].b[0] + tmp_uvdata[i].sum_b[0] / tmp_uvdata[i].ncounter));
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list