diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-02-03 07:29:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-03 07:29:48 +0300 |
commit | 5206124ce164529fae98d7bef62afb10e22af516 (patch) | |
tree | 97ff60494e532c735ce0521d733a31a9ac418cdc | |
parent | 7e60e7a1858cca497bf355d80b448a32a1a69363 (diff) | |
parent | f51286cb8cc845bf4218623ce9f89e17706ff49e (diff) |
Merge branch 'blender-v2.82-release'
-rw-r--r-- | source/blender/editors/interface/view2d_gizmo_navigate.c | 5 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_gizmo_navigate.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/interface/view2d_gizmo_navigate.c b/source/blender/editors/interface/view2d_gizmo_navigate.c index d0281ad1eef..09da9f077d4 100644 --- a/source/blender/editors/interface/view2d_gizmo_navigate.c +++ b/source/blender/editors/interface/view2d_gizmo_navigate.c @@ -18,6 +18,7 @@ * \ingroup edinterface */ +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" @@ -213,8 +214,8 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g const float icon_size = GIZMO_SIZE; const float icon_offset_mini = icon_size * GIZMO_MINI_OFFSET_FAC * UI_DPI_FAC; const float co[2] = { - rect_visible->xmax - (icon_offset_mini * 0.75f), - rect_visible->ymax - (icon_offset_mini * 0.75f), + roundf(rect_visible->xmax - (icon_offset_mini * 0.75f)), + roundf(rect_visible->ymax - (icon_offset_mini * 0.75f)), }; wmGizmo *gz; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c index 53a5609d437..25dd5b69f98 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c @@ -285,8 +285,8 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g } const float co[2] = { - rect_visible->xmax - icon_offset_mini * 0.75f, - rect_visible->ymax - icon_offset_from_axis, + roundf(rect_visible->xmax - icon_offset_mini * 0.75f), + roundf(rect_visible->ymax - icon_offset_from_axis), }; wmGizmo *gz; |