Merge branch 'blender-v2.90-release' into master

2020-08-18 12:29:15 +10:00
parent c65c66320f d1057890c4
commit 3c690aa4bc
5 changed files with 19 additions and 18 deletions
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4845,7 +4845,7 @@ static bool ui_numedit_but_NUM(uiBut *but,

    if (is_float == false) {
      /* at minimum, moving cursor 2 pixels should change an int button. */
-      CLAMP_MIN(non_linear_scale, 0.5f * U.pixelsize);
+      CLAMP_MIN(non_linear_scale, 0.5f * UI_DPI_FAC);
    }

    data->dragf += (((float)(mx - data->draglastx)) / deler) * non_linear_scale;