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

Merge branch 'blender-v2.82-release'

Browse Source
This commit is contained in:
Campbell Barton
2020-02-03 15:29:48 +11:00
parent 7e60e7a185 f51286cb8c
commit 5206124ce1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/view2d_gizmo_navigate.c
View File

@@ -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;

4
source/blender/editors/space_view3d/view3d_gizmo_navigate.c
View File

@@ -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;