diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-01 07:20:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-01 07:26:18 +0400 |
commit | 13ea967cce4032564cfbbfe3010b538486f36524 (patch) | |
tree | fff7d2eaddd8bc1b6034f76729bb34c12c555607 /source/blender/editors/interface | |
parent | 315d85faa1b4f58a91041030dcac70085808c038 (diff) |
Code cleanup: correct abs use and quiet warnings
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 527eb9b966b..079b64f852c 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3364,11 +3364,11 @@ static bool ui_numedit_but_NUM(uiBut *but, uiHandleButtonData *data, if ((is_float == true) && (softrange > 11)) { /* non linear change in mouse input- good for high precicsion */ - data->dragf += (((float)(mx - data->draglastx)) / deler) * (fabsf(mx - data->dragstartx) / 500.0f); + data->dragf += (((float)(mx - data->draglastx)) / deler) * ((float)abs(mx - data->dragstartx) / 500.0f); } else if ((is_float == false) && (softrange > 129)) { /* only scale large int buttons */ /* non linear change in mouse input- good for high precicsionm ints need less fine tuning */ - data->dragf += (((float)(mx - data->draglastx)) / deler) * (fabsf(mx - data->dragstartx) / 250.0f); + data->dragf += (((float)(mx - data->draglastx)) / deler) * ((float)abs(mx - data->dragstartx) / 250.0f); } else { /*no scaling */ @@ -3487,8 +3487,8 @@ static int ui_do_but_NUM(bContext *C, uiBlock *block, uiBut *but, uiHandleButton float fac; #ifdef USE_DRAG_MULTINUM - data->multi_data.drag_dir[0] += fabsf(data->draglastx - mx); - data->multi_data.drag_dir[1] += fabsf(data->draglasty - my); + data->multi_data.drag_dir[0] += abs(data->draglastx - mx); + data->multi_data.drag_dir[1] += abs(data->draglasty - my); #endif fac = 1.0f; @@ -3770,8 +3770,8 @@ static int ui_do_but_SLI(bContext *C, uiBlock *block, uiBut *but, uiHandleButton } else if (event->type == MOUSEMOVE) { #ifdef USE_DRAG_MULTINUM - data->multi_data.drag_dir[0] += fabsf(data->draglastx - mx); - data->multi_data.drag_dir[1] += fabsf(data->draglasty - my); + data->multi_data.drag_dir[0] += abs(data->draglastx - mx); + data->multi_data.drag_dir[1] += abs(data->draglasty - my); #endif if (ui_numedit_but_SLI(but, data, mx, true, event->ctrl != 0, event->shift != 0)) ui_numedit_apply(C, block, but, data); |