[Bf-blender-cvs] [e301cf3] master: Cleanup: double-promotion warnings
Campbell Barton
noreply at git.blender.org
Sat Jul 25 05:32:21 CEST 2015
Commit: e301cf3ec2cb8caa544032238cf7a1e7bb5e2523
Author: Campbell Barton
Date: Sat Jul 25 13:26:20 2015 +1000
Branches: master
https://developer.blender.org/rBe301cf3ec2cb8caa544032238cf7a1e7bb5e2523
Cleanup: double-promotion warnings
===================================================================
M source/blender/bmesh/operators/bmo_join_triangles.c
M source/blender/bmesh/operators/bmo_subdivide.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/bmesh/tools/bmesh_decimate_collapse.c
M source/blender/editors/animation/anim_draw.c
M source/blender/editors/curve/editcurve_select.c
M source/blender/editors/interface/interface_panel.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c
index b873e6b..3718f14 100644
--- a/source/blender/bmesh/operators/bmo_join_triangles.c
+++ b/source/blender/bmesh/operators/bmo_join_triangles.c
@@ -105,7 +105,7 @@ static float quad_calc_error(
area_min = min_ff(area_a, area_b);
area_max = max_ff(area_a, area_b);
- diff = area_max ? (1.0 - (area_min / area_max)) : 1.0f;
+ diff = area_max ? (1.0f - (area_min / area_max)) : 1.0f;
error += diff;
}
diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c
index e330429..45e3c8d 100644
--- a/source/blender/bmesh/operators/bmo_subdivide.c
+++ b/source/blender/bmesh/operators/bmo_subdivide.c
@@ -184,7 +184,7 @@ static void alter_co(
float fac, len, val;
sub_v3_v3v3(dir, v_a->co, v_b->co);
- len = M_SQRT1_2 * normalize_v3(dir);
+ len = (float)M_SQRT1_2 * normalize_v3(dir);
/* cosine angle */
fac = dot_v3v3(dir, v_a->no);
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 308c187..b47f56d 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -758,7 +758,7 @@ static void offset_meet(EdgeHalf *e1, EdgeHalf *e2, BMVert *v, BMFace *f, bool e
copy_v3_v3(meetco, closer_v->co);
e1->offset_r = len_v3v3(meetco, v->co);
}
- if (edges_between && e1->offset_r > 0.0 && e2->offset_l > 0.0) {
+ if (edges_between && e1->offset_r > 0.0f && e2->offset_l > 0.0f) {
/* Try to drop meetco to a face between e1 and e2 */
if (isect_kind == 2) {
/* lines didn't meet in 3d: get average of meetco and isect2 */
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
index c353324..43a3433 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
@@ -111,7 +111,7 @@ static void bm_decim_build_quadrics(BMesh *bm, Quadric *vquadrics)
cross_v3_v3v3(edge_plane, edge_vector, f->no);
copy_v3db_v3fl(edge_plane_db, edge_plane);
- if (normalize_v3_d(edge_plane_db) > FLT_EPSILON) {
+ if (normalize_v3_d(edge_plane_db) > (double)FLT_EPSILON) {
Quadric q;
float center[3];
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index 4980860..33a5447 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -494,11 +494,14 @@ void ANIM_center_frame(struct bContext *C, int smooth_viewtx)
switch (U.view_frame_type) {
case ZOOM_FRAME_MODE_SECONDS:
- newrct.xmax = scene->r.cfra + U.view_frame_seconds * FPS + 1;
- newrct.xmin = scene->r.cfra - U.view_frame_seconds * FPS - 1;
+ {
+ const float fps = FPS;
+ newrct.xmax = scene->r.cfra + U.view_frame_seconds * fps + 1;
+ newrct.xmin = scene->r.cfra - U.view_frame_seconds * fps - 1;
newrct.ymax = ar->v2d.cur.ymax;
newrct.ymin = ar->v2d.cur.ymin;
break;
+ }
/* hardest case of all, look for all keyframes around frame and display those */
case ZOOM_FRAME_MODE_KEYFRAMES:
diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c
index ef7097d..55d8d10 100644
--- a/source/blender/editors/curve/editcurve_select.c
+++ b/source/blender/editors/curve/editcurve_select.c
@@ -1285,7 +1285,7 @@ static bool curve_select_similar_direction(ListBase *editnurb, Curve *cu, float
}
/* map 0-1 to radians, 'cos' for comparison */
- angle_cos = cosf(thresh * M_PI_2);
+ angle_cos = cosf(thresh * (float)M_PI_2);
for (nu = editnurb->first; nu; nu = nu->next) {
if (nu->type == CU_BEZIER) {
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 665266e..c69aed7 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -1061,7 +1061,6 @@ void UI_panels_scale(ARegion *ar, float new_width)
for (block = ar->uiblocks.first; block; block = block->next) {
if (block->panel) {
float fac = new_width / (float)block->panel->sizex;
- printf("scaled %f\n", fac);
block->panel->sizex = new_width;
for (but = block->buttons.first; but; but = but->next) {
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 514fafc..cab9b02 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4486,7 +4486,7 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
break;
case PROP_PERCENTAGE:
new_value = ((dist - WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE) / WM_RADIAL_CONTROL_DISPLAY_WIDTH) * 100.0f;
- if (snap) new_value = ((int)(new_value + 2.5)) / 5 * 5;
+ if (snap) new_value = ((int)(new_value + 2.5f)) / 5 * 5;
break;
case PROP_FACTOR:
new_value = (WM_RADIAL_CONTROL_DISPLAY_SIZE - dist) / WM_RADIAL_CONTROL_DISPLAY_WIDTH;
@@ -4734,7 +4734,7 @@ static int redraw_timer_exec(bContext *C, wmOperator *op)
redraw_timer_step(C, bmain, scene, win, sa, ar, type, cfra);
iter_steps += 1;
- if (time_limit != 0.0f) {
+ if (time_limit != 0.0) {
if ((PIL_check_seconds_timer() - time_start) > time_limit) {
break;
}
More information about the Bf-blender-cvs
mailing list