From c824c06f3881bbaf11eb0d89b5c6df56dad2cecf Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 9 Feb 2022 23:07:48 -0600 Subject: Cleanup: Clang tidy, unused variabel warnings --- source/blender/blenkernel/BKE_object.h | 2 +- source/blender/blenkernel/intern/object_update.c | 1 - source/blender/draw/engines/overlay/overlay_armature.c | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 96ed7942067..e8ff0903b04 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -432,7 +432,7 @@ void BKE_object_eval_constraints(struct Depsgraph *depsgraph, struct Object *ob); void BKE_object_eval_transform_final(struct Depsgraph *depsgraph, struct Object *ob); -void BKE_object_eval_uber_transform(struct Depsgraph *depsgraph, struct Object *ob); +void BKE_object_eval_uber_transform(struct Depsgraph *depsgraph, struct Object *object); void BKE_object_eval_uber_data(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob); diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 12ae57af2c3..6352fd19239 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -304,7 +304,6 @@ void BKE_object_sync_to_original(Depsgraph *depsgraph, Object *object) void BKE_object_eval_uber_transform(Depsgraph *UNUSED(depsgraph), Object *UNUSED(object)) { - return; } void BKE_object_data_batch_cache_dirty_tag(ID *object_data) diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index 5abebe2f32b..f9694b329aa 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -2117,6 +2117,7 @@ static bool pchan_culling_test_envelope(const DRWView *view, { const bArmature *arm = ob->data; BLI_assert(arm->drawtype == ARM_ENVELOPE); + UNUSED_VARS_NDEBUG(arm); BoundSphere bsphere; pchan_culling_calc_bsphere(ob, pchan, &bsphere); bsphere.radius += max_ff(pchan->bone->rad_head, pchan->bone->rad_tail) * @@ -2130,6 +2131,7 @@ static bool pchan_culling_test_bbone(const DRWView *view, { const bArmature *arm = ob->data; BLI_assert(arm->drawtype == ARM_B_BONE); + UNUSED_VARS_NDEBUG(arm); const float ob_scale = mat4_to_size_max_axis(ob->obmat); const Mat4 *bbones_mat = (const Mat4 *)pchan->draw_data->bbone_matrix; for (int i = pchan->bone->segments; i--; bbones_mat++) { -- cgit v1.2.3