diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-03-02 16:43:20 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-03-02 17:21:07 +0300 |
commit | 360443a48346dc7c22fc6627849515da490b6e7b (patch) | |
tree | ab7bed81bafaab2cbdb05daa2eb5de79a2c49053 | |
parent | d8198b27df200cd14c9f9d5b55db73dc55f4cb5a (diff) |
Fix T74278: Light, Image Object, and Compositor Backdrop Viewer Node
gizmos are too big
Caused by rB9cac5fa681c5 which fixed the handles for the camera border
gizmo (being much too small)-- which in turn was broken by
rB98e4fbc7cc9e.
Camera border gizmo sets up its matrix_space a bit differently [this is
why we are getting very small values in gizmo_calc_rect_view_scale --
needs more investigation], but instead of breaking it for Light, Image
and Compositor Backdrop, lets just compensate by scaling the Camera
Border Gizmo for now.
Maniphest Tasks: T74278
Differential Revision: https://developer.blender.org/D6991
-rw-r--r-- | source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_gizmo_camera.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c index 4490892695f..5ff76d886c2 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -91,7 +91,7 @@ static bool gizmo_calc_rect_view_scale(const wmGizmo *gz, const float dims[2], f static bool gizmo_calc_rect_view_margin(const wmGizmo *gz, const float dims[2], float margin[2]) { float handle_size; - handle_size = 10.0f; + handle_size = 0.15f; handle_size *= gz->scale_final; float scale_xy[2]; if (!gizmo_calc_rect_view_scale(gz, dims, scale_xy)) { diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c index ba5ca5fbd15..8e279b2d11a 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c @@ -432,6 +432,8 @@ static void WIDGETGROUP_camera_view_setup(const bContext *UNUSED(C), wmGizmoGrou /* Box style is more subtle in this case. */ RNA_enum_set(viewgroup->border->ptr, "draw_style", ED_GIZMO_CAGE2D_STYLE_BOX); + WM_gizmo_set_scale(viewgroup->border, 10.0f / 0.15f); + gzgroup->customdata = viewgroup; } |