From 45240026a2cf0eb57c7bb2dd1643d334308f02b9 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Fri, 16 May 2025 13:43:56 +0200 Subject: [PATCH] Refactor: Remove unused bone flag No functional changes intended. This removes the `BONE_HIDDEN_PG` flag for Bones. It was never set, only read so it had no effect. Part of #138482 Pull Request: https://projects.blender.org/blender/blender/pulls/138802 --- source/blender/animrig/ANIM_bone_collections.hh | 2 +- source/blender/draw/engines/overlay/overlay_armature.cc | 2 +- .../blender/editors/transform/transform_snap_object_armature.cc | 2 +- source/blender/makesdna/DNA_armature_types.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/source/blender/animrig/ANIM_bone_collections.hh b/source/blender/animrig/ANIM_bone_collections.hh index 10296b98d6d..530c05599a9 100644 --- a/source/blender/animrig/ANIM_bone_collections.hh +++ b/source/blender/animrig/ANIM_bone_collections.hh @@ -307,7 +307,7 @@ bool ANIM_bone_in_visible_collection(const bArmature *armature, const Bone *bone inline bool ANIM_bone_is_visible(const bArmature *armature, const Bone *bone) { - const bool bone_itself_visible = (bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)) == 0; + const bool bone_itself_visible = (bone->flag & BONE_HIDDEN_P) == 0; return bone_itself_visible && ANIM_bone_in_visible_collection(armature, bone); } diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc index 86b04914f59..90516f49e72 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.cc +++ b/source/blender/draw/engines/overlay/overlay_armature.cc @@ -2183,7 +2183,7 @@ void Armatures::draw_armature_pose(Armatures::DrawContext *ctx) } eBone_Flag boneflag = eBone_Flag(bone->flag); - if (bone->parent && (bone->parent->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG))) { + if (bone->parent && (bone->parent->flag & BONE_HIDDEN_P)) { /* Avoid drawing connection line to hidden parent. */ boneflag &= ~BONE_CONNECTED; } diff --git a/source/blender/editors/transform/transform_snap_object_armature.cc b/source/blender/editors/transform/transform_snap_object_armature.cc index 714273d65a1..d53c5cf434f 100644 --- a/source/blender/editors/transform/transform_snap_object_armature.cc +++ b/source/blender/editors/transform/transform_snap_object_armature.cc @@ -65,7 +65,7 @@ eSnapMode snapArmature(SnapObjectContext *sctx, else if (ob_eval->pose && ob_eval->pose->chanbase.first) { LISTBASE_FOREACH (bPoseChannel *, pchan, &ob_eval->pose->chanbase) { Bone *bone = pchan->bone; - if (!bone || (bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG))) { + if (!bone || (bone->flag & BONE_HIDDEN_P)) { /* Skip hidden bones. */ continue; } diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index 5e83a054066..d2649d905b2 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -452,8 +452,6 @@ typedef enum eBone_Flag { /** No parent scale */ BONE_NO_SCALE = (1 << 15), #endif - /** hidden bone when drawing PoseChannels (for ghost drawing) */ - BONE_HIDDEN_PG = (1 << 16), /** bone should be drawn as OB_WIRE, regardless of draw-types of view+armature */ BONE_DRAWWIRE = (1 << 17), /** when no parent, bone will not get cyclic offset */