Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2012-05-16 06:40:14 +0400
committerJoshua Leung <aligorith@gmail.com>2012-05-16 06:40:14 +0400
commitffd56fdae493ed975903029f10173b79540ccc0a (patch)
tree08b5c0244be0fa4490559632e380695ce618426d
parented33320e3f149f4106ed70b82d019113970c991e (diff)
Bugfix [#31469] 'cyclic offset' option is broken
Removing this option from the UI. Cyclic offset and/or other the myriad of other half-working walk/stride cycle stuff has been removed pending further review at a later date about what's really needed, and the best way to do so with regards to different rig types (i.e. setup antagonistic).
-rw-r--r--release/scripts/startup/bl_ui/properties_data_bone.py3
-rw-r--r--source/blender/makesrna/intern/rna_armature.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py
index 10c4c1fdd04..11524cf9c03 100644
--- a/release/scripts/startup/bl_ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -356,9 +356,6 @@ class BONE_PT_deform(BoneButtonsPanel, Panel):
sub.prop(bone, "bbone_in", text="Ease In")
sub.prop(bone, "bbone_out", text="Ease Out")
- col.label(text="Offset:")
- col.prop(bone, "use_cyclic_offset")
-
class BONE_PT_custom_props(BoneButtonsPanel, PropertyPanel, Panel):
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index 45887a2264d..16328c4f864 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -492,10 +492,12 @@ static void rna_def_bone_common(StructRNA *srna, int editbone)
"(useful for non-obstructive custom bone shapes)");
RNA_def_property_update(prop, 0, "rna_Armature_redraw_data");
+ /* XXX: use_cyclic_offset is deprecated in 2.5. May/may not return */
prop = RNA_def_property(srna, "use_cyclic_offset", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", BONE_NO_CYCLICOFFSET);
RNA_def_property_ui_text(prop, "Cyclic Offset",
- "When bone doesn't have a parent, it receives cyclic offset effects");
+ "When bone doesn't have a parent, it receives cyclic offset effects (Deprecated)");
+ // "When bone doesn't have a parent, it receives cyclic offset effects");
RNA_def_property_update(prop, 0, "rna_Armature_update_data");
prop = RNA_def_property(srna, "hide_select", PROP_BOOLEAN, PROP_NONE);