From 2abd026cfedaecbb0be039c02f2aa142cef3fc09 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Mon, 25 Sep 2023 11:13:36 +0200 Subject: [PATCH] Anim: remove the deprecated use_inherit_scale bone property. This boolean property has been replaced with an enum all the way back in 2019, so it is time to remove it completely. It is purely an RNA wrapper around the real enum property, so the only thing this change can break is some python scripts and add-ons. Pull Request: https://projects.blender.org/blender/blender/pulls/112836 --- .../blender/makesrna/intern/rna_armature.cc | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index 463a4a7dc54..c88684cefb1 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -594,40 +594,6 @@ static IDProperty **rna_EditBone_idprops(PointerRNA *ptr) return &ebone->prop; } -/* TODO: remove the deprecation stubs. */ -static bool rna_use_inherit_scale_get(char inherit_scale_mode) -{ - return inherit_scale_mode <= BONE_INHERIT_SCALE_FIX_SHEAR; -} - -static void rna_use_inherit_scale_set(char *inherit_scale_mode, bool value) -{ - bool cur_value = (*inherit_scale_mode <= BONE_INHERIT_SCALE_FIX_SHEAR); - if (value != cur_value) { - *inherit_scale_mode = (value ? BONE_INHERIT_SCALE_FULL : BONE_INHERIT_SCALE_NONE); - } -} - -static bool rna_EditBone_use_inherit_scale_get(PointerRNA *ptr) -{ - return rna_use_inherit_scale_get(((EditBone *)ptr->data)->inherit_scale_mode); -} - -static void rna_EditBone_use_inherit_scale_set(PointerRNA *ptr, bool value) -{ - rna_use_inherit_scale_set(&((EditBone *)ptr->data)->inherit_scale_mode, value); -} - -static bool rna_Bone_use_inherit_scale_get(PointerRNA *ptr) -{ - return rna_use_inherit_scale_get(((Bone *)ptr->data)->inherit_scale_mode); -} - -static void rna_Bone_use_inherit_scale_set(PointerRNA *ptr, bool value) -{ - rna_use_inherit_scale_set(&((Bone *)ptr->data)->inherit_scale_mode, value); -} - static void rna_EditBone_name_set(PointerRNA *ptr, const char *value) { bArmature *arm = (bArmature *)ptr->owner_id; @@ -1229,20 +1195,6 @@ static void rna_def_bone_common(StructRNA *srna, int editbone) RNA_def_property_enum_items(prop, prop_inherit_scale_mode); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); - /* TODO: remove the compatibility stub. */ - prop = RNA_def_property(srna, "use_inherit_scale", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_ui_text( - prop, "Inherit Scale", "DEPRECATED: Bone inherits scaling from parent bone"); - if (editbone) { - RNA_def_property_boolean_funcs( - prop, "rna_EditBone_use_inherit_scale_get", "rna_EditBone_use_inherit_scale_set"); - } - else { - RNA_def_property_boolean_funcs( - prop, "rna_Bone_use_inherit_scale_get", "rna_Bone_use_inherit_scale_set"); - } - RNA_def_property_update(prop, 0, "rna_Armature_update_data"); - prop = RNA_def_property(srna, "use_local_location", PROP_BOOLEAN, PROP_NONE); RNA_def_property_ui_text(prop, "Local Location", "Bone location is set in local space"); RNA_def_property_boolean_negative_sdna(prop, nullptr, "flag", BONE_NO_LOCAL_LOCATION);