main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Showing only changes of commit 3a1d5e6032 - Show all commits

View File

@ -54,10 +54,14 @@
using blender::MutableSpan; using blender::MutableSpan;
#define REMOVE_GIZMO_HEIGHT 14.0f * U.dpi_fac /* Pixels from bottom of strip. */ /** Pixels from bottom of strip. */
#define RETIME_HANDLE_TRIANGLE_SIZE 14.0f * U.dpi_fac /* Size in pixels. */ #define REMOVE_GIZMO_HEIGHT (14.0f * U.dpi_fac)
#define RETIME_HANDLE_MOUSEOVER_THRESHOLD 16.0f * U.dpi_fac /* Size in pixels. */ /** Size in pixels. */
#define RETIME_BUTTON_SIZE 0.6f /* Factor based on icon size. */ #define RETIME_HANDLE_TRIANGLE_SIZE (14.0f * U.dpi_fac)
/** Size in pixels. */
#define RETIME_HANDLE_MOUSEOVER_THRESHOLD (16.0f * U.dpi_fac)
/** Factor based on icon size. */
#define RETIME_BUTTON_SIZE 0.6f
static float strip_y_rescale(const Sequence *seq, const float y_value) static float strip_y_rescale(const Sequence *seq, const float y_value)
{ {