From 3435ea014d42d1e223513f448cbdaba63864115c Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 20 Oct 2021 14:56:18 +0200 Subject: Cleanup: unused parameters, `nullptr` instead of `NULL` in cpp code... --- source/blender/blenkernel/intern/armature_test.cc | 2 +- source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c | 2 +- source/blender/editors/space_view3d/view3d_cursor_snap.c | 2 +- source/blender/editors/space_view3d/view3d_placement.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/blenkernel/intern/armature_test.cc b/source/blender/blenkernel/intern/armature_test.cc index 3d22351e9a6..bd2088c6aba 100644 --- a/source/blender/blenkernel/intern/armature_test.cc +++ b/source/blender/blenkernel/intern/armature_test.cc @@ -309,7 +309,7 @@ static double test_vec_roll_to_mat3_orthogonal(double s, double x, double z) { const float input[3] = {float(x), float(s * sqrt(1 - x * x - z * z)), float(z)}; - return test_vec_roll_to_mat3_normalized(input, 0.0f, NULL); + return test_vec_roll_to_mat3_normalized(input, 0.0f, nullptr); } /** Test that the matrix is orthogonal for a range of inputs close to -Y. */ diff --git a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c index b95935f2e06..13d9f1ecda7 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c @@ -100,7 +100,7 @@ bool ED_gizmotypes_snap_3d_invert_snap_get(struct wmGizmo *UNUSED(gz)) return snap_data->is_snap_invert; } -bool ED_gizmotypes_snap_3d_is_enabled(const wmGizmo *gz) +bool ED_gizmotypes_snap_3d_is_enabled(const wmGizmo *UNUSED(gz)) { V3DSnapCursorData *snap_data = ED_view3d_cursor_snap_data_get(NULL, NULL, 0, 0); return snap_data->is_enabled; diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.c b/source/blender/editors/space_view3d/view3d_cursor_snap.c index b3e010bb938..4457afcb67f 100644 --- a/source/blender/editors/space_view3d/view3d_cursor_snap.c +++ b/source/blender/editors/space_view3d/view3d_cursor_snap.c @@ -754,7 +754,7 @@ static bool v3d_cursor_snap_pool_fn(bContext *C) return true; } -static void v3d_cursor_snap_draw_fn(bContext *C, int x, int y, void *customdata) +static void v3d_cursor_snap_draw_fn(bContext *C, int x, int y, void *UNUSED(customdata)) { SnapCursorDataIntern *data_intern = &g_data_intern; V3DSnapCursorState *state = ED_view3d_cursor_snap_state_get(); diff --git a/source/blender/editors/space_view3d/view3d_placement.c b/source/blender/editors/space_view3d/view3d_placement.c index bffcdcfc320..09d3aa31811 100644 --- a/source/blender/editors/space_view3d/view3d_placement.c +++ b/source/blender/editors/space_view3d/view3d_placement.c @@ -694,8 +694,8 @@ static void draw_primitive_view(const struct bContext *C, ARegion *UNUSED(region * Use by both the operator and placement cursor. * \{ */ -static bool view3d_interactive_add_calc_snap(bContext *C, - const wmEvent *event, +static bool view3d_interactive_add_calc_snap(bContext *UNUSED(C), + const wmEvent *UNUSED(event), float r_co_src[3], float r_matrix_orient[3][3], bool *r_is_enabled, -- cgit v1.2.3