[Bf-blender-cvs] [c824c06f388] master: Cleanup: Clang tidy, unused variabel warnings

Hans Goudey noreply at git.blender.org
Thu Feb 10 06:07:54 CET 2022


Commit: c824c06f3881bbaf11eb0d89b5c6df56dad2cecf
Author: Hans Goudey
Date:   Wed Feb 9 23:07:48 2022 -0600
Branches: master
https://developer.blender.org/rBc824c06f3881bbaf11eb0d89b5c6df56dad2cecf

Cleanup: Clang tidy, unused variabel warnings

===================================================================

M	source/blender/blenkernel/BKE_object.h
M	source/blender/blenkernel/intern/object_update.c
M	source/blender/draw/engines/overlay/overlay_armature.c

===================================================================

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++) {



More information about the Bf-blender-cvs mailing list