diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 18:52:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 18:52:16 +0400 |
commit | 8d7c3f8a7e6de7625b3631cd91242fbefa98cf3a (patch) | |
tree | e839ba73dfdff4795060b63fa88c1fdecdf03b73 /source/blender/editors/interface/view2d_ops.c | |
parent | 0b9f67061ce34e6147a013cc7025bb194c4e693e (diff) |
interface: floats were being implicitly promoted to doubles, adjust to use floats (in most cases) otherwise cast to double.
Diffstat (limited to 'source/blender/editors/interface/view2d_ops.c')
-rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 10aac4ce0a6..123f9e2044f 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -607,7 +607,7 @@ static void view_zoomstep_apply(bContext *C, wmOperator *op) else { if (U.uiflag & USER_ZOOM_TO_MOUSEPOS) { float mval_fac = (vzd->mx_2d - v2d->cur.xmin) / (v2d->cur.xmax-v2d->cur.xmin); - float mval_faci = 1.0 - mval_fac; + float mval_faci = 1.0f - mval_fac; float ofs= (mval_fac * dx) - (mval_faci * dx); v2d->cur.xmin += ofs + dx; @@ -632,7 +632,7 @@ static void view_zoomstep_apply(bContext *C, wmOperator *op) else { if (U.uiflag & USER_ZOOM_TO_MOUSEPOS) { float mval_fac = (vzd->my_2d - v2d->cur.ymin) / (v2d->cur.ymax-v2d->cur.ymin); - float mval_faci = 1.0 - mval_fac; + float mval_faci = 1.0f - mval_fac; float ofs= (mval_fac * dy) - (mval_faci * dy); v2d->cur.ymin += ofs + dy; @@ -817,7 +817,7 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op) else { if (U.uiflag & USER_ZOOM_TO_MOUSEPOS) { float mval_fac = (vzd->mx_2d - v2d->cur.xmin) / (v2d->cur.xmax-v2d->cur.xmin); - float mval_faci = 1.0 - mval_fac; + float mval_faci = 1.0f - mval_fac; float ofs= (mval_fac * dx) - (mval_faci * dx); v2d->cur.xmin += ofs + dx; @@ -836,7 +836,7 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op) else { if (U.uiflag & USER_ZOOM_TO_MOUSEPOS) { float mval_fac = (vzd->my_2d - v2d->cur.ymin) / (v2d->cur.ymax-v2d->cur.ymin); - float mval_faci = 1.0 - mval_fac; + float mval_faci = 1.0f - mval_fac; float ofs= (mval_fac * dy) - (mval_faci * dy); v2d->cur.ymin += ofs + dy; @@ -1448,9 +1448,9 @@ static int scroller_activate_modal(bContext *C, wmOperator *op, wmEvent *event) /* single-click was in empty space outside bubble, so scroll by 1 'page' */ if (ELEM(vsm->zone, SCROLLHANDLE_MIN_OUTSIDE, SCROLLHANDLE_MAX_OUTSIDE)) { if (vsm->zone == SCROLLHANDLE_MIN_OUTSIDE) - vsm->delta = -vsm->scrollbarwidth * 0.8; + vsm->delta = -vsm->scrollbarwidth * 0.8f; else if (vsm->zone == SCROLLHANDLE_MAX_OUTSIDE) - vsm->delta = vsm->scrollbarwidth * 0.8; + vsm->delta = vsm->scrollbarwidth * 0.8f; scroller_activate_apply(C, op); scroller_activate_exit(C, op); |