archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

use min/max inline functions where MIN2/MAX2 were doing type conversion.

Browse Source
This commit is contained in:
Campbell Barton
2012-10-27 11:18:54 +00:00
parent ec67334e25
commit 9fc95bd7ee
23 changed files with 57 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_widgets.c
View File

@@ -2407,7 +2407,7 @@ static void widget_scroll(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
value = ui_get_but_val(but);
size = (but->softmax + but->a1 - but->softmin);
size = MAX2(size, 2);
size = max_ff(size, 2.0f);
/* position */
rect1 = *rect;
@@ -2445,7 +2445,7 @@ static void widget_scroll(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
if (rect1.ymax > rect->ymax) {
rect1.ymax = rect->ymax;
rect1.ymin = MAX2(rect1.ymax - min, rect->ymin);
rect1.ymin = max_ii(rect1.ymax - min, rect->ymin);
}
}
}