diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-25 06:26:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-25 06:26:20 +0300 |
| commit | e301cf3ec2cb8caa544032238cf7a1e7bb5e2523 (patch) | |
| tree | 8f564a932b1e739eeadd395f69499bf548ed7dfe /source/blender/editors | |
| parent | 2a286829f7fa19ffceb6ec6be095ee11305353e3 (diff) | |
Cleanup: double-promotion warnings
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve_select.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_panel.c | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 498086047ad..33a5447698a 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 ef7097deb4c..55d8d10856b 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 665266edb9f..c69aed76b22 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) { |