diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-09-27 04:18:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-27 04:18:23 +0300 |
commit | 9bd40cbce17fdc6368814f7cdeaef9bca3fcb7e5 (patch) | |
tree | 0a7a20e1987174f6d56fe71bc119f8f54cf6b1b5 /source/blender/editors/animation/anim_channels_defines.c | |
parent | a24dd6eabafa421352488bc8721a02690da2177f (diff) | |
parent | 43b49130516db974c125d89919fe8ddc25cf4405 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 69e8f708e3d..4f76571a485 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -4481,8 +4481,8 @@ void ANIM_channel_draw_widgets(const bContext *C, bAnimContext *ac, bAnimListEle * a callback available (e.g. broken F-Curve rename) */ if (acf->name_prop(ale, &ptr, &prop)) { - const short margin_x = 3 * iroundf(UI_DPI_FAC); - const short channel_height = iroundf(ymaxc - yminc); + const short margin_x = 3 * round_fl_to_int(UI_DPI_FAC); + const short channel_height = round_fl_to_int(ymaxc - yminc); const short width = ac->ar->winx - offset - (margin_x * 2); uiBut *but; |