diff options
Diffstat (limited to 'source/blender/editors/gizmo_library')
6 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/editors/gizmo_library/gizmo_library_presets.c b/source/blender/editors/gizmo_library/gizmo_library_presets.c index 1ac4ce0bcdf..465c72dd44f 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_presets.c +++ b/source/blender/editors/gizmo_library/gizmo_library_presets.c @@ -114,7 +114,7 @@ void ED_gizmo_draw_preset_facemap( } GPU_matrix_push(); - GPU_matrix_mul(ob->obmat); + GPU_matrix_mul(ob->object_to_world); ED_draw_object_facemap(depsgraph, ob, color, facemap); GPU_matrix_pop(); diff --git a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c index 6eac235a191..dca19dcf516 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c @@ -73,7 +73,7 @@ static void button2d_geom_draw_backdrop(const wmGizmo *gz, GPU_viewport_size_get_f(viewport); const float max_pixel_error = 0.25f; - int nsegments = (int)(ceilf(M_PI / acosf(1.0f - max_pixel_error / screen_scale))); + int nsegments = (int)ceilf(M_PI / acosf(1.0f - max_pixel_error / screen_scale)); nsegments = max_ff(nsegments, 8); nsegments = min_ff(nsegments, 1000); 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 600abaf3737..4b78b122764 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -83,8 +83,8 @@ static bool gizmo_calc_rect_view_margin(const wmGizmo *gz, const float dims[2], return false; } - margin[0] = ((handle_size * scale_xy[0])); - margin[1] = ((handle_size * scale_xy[1])); + margin[0] = (handle_size * scale_xy[0]); + margin[1] = (handle_size * scale_xy[1]); return true; } diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c index 0a5ec3330c2..8e4b4519ff8 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c @@ -81,9 +81,9 @@ static void gizmo_calc_rect_view_margin(const wmGizmo *gz, const float dims[3], float scale_xyz[3]; gizmo_calc_rect_view_scale(gz, dims, scale_xyz); - margin[0] = ((handle_size * scale_xyz[0])); - margin[1] = ((handle_size * scale_xyz[1])); - margin[2] = ((handle_size * scale_xyz[2])); + margin[0] = (handle_size * scale_xyz[0]); + margin[1] = (handle_size * scale_xyz[1]); + margin[2] = (handle_size * scale_xyz[2]); } /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c index 9b7b157dc7e..d7ae9be6c33 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c @@ -106,9 +106,9 @@ static void dial_geom_draw(const float color[4], UNUSED_VARS(gz, axis_modal_mat, clip_plane); wm_gizmo_geometryinfo_draw(&wm_gizmo_geom_data_dial, select, color); #else - const bool filled = ((draw_options & (select ? (ED_GIZMO_DIAL_DRAW_FLAG_FILL | - ED_GIZMO_DIAL_DRAW_FLAG_FILL_SELECT) : - ED_GIZMO_DIAL_DRAW_FLAG_FILL))); + const bool filled = (draw_options & (select ? (ED_GIZMO_DIAL_DRAW_FLAG_FILL | + ED_GIZMO_DIAL_DRAW_FLAG_FILL_SELECT) : + ED_GIZMO_DIAL_DRAW_FLAG_FILL)); GPUVertFormat *format = immVertexFormat(); /* NOTE(Metal): Prefer using 3D coordinates with 3D shader, even if rendering 2D gizmo's. */ diff --git a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c index af1f09d7e25..f6ae02dd010 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c @@ -93,9 +93,9 @@ static void move_geom_draw(const wmGizmo *gz, #else const int draw_style = RNA_enum_get(gz->ptr, "draw_style"); const bool filled = (draw_style != ED_GIZMO_MOVE_STYLE_CROSS_2D) && - ((draw_options & (select ? (ED_GIZMO_MOVE_DRAW_FLAG_FILL | - ED_GIZMO_MOVE_DRAW_FLAG_FILL_SELECT) : - ED_GIZMO_MOVE_DRAW_FLAG_FILL))); + (draw_options & (select ? (ED_GIZMO_MOVE_DRAW_FLAG_FILL | + ED_GIZMO_MOVE_DRAW_FLAG_FILL_SELECT) : + ED_GIZMO_MOVE_DRAW_FLAG_FILL)); GPUVertFormat *format = immVertexFormat(); /* NOTE(Metal): Prefer using 3D coordinates with 3D shader, even if rendering 2D gizmo's. */ |