[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46678] trunk/blender: Bugfix [#31469] ' cyclic offset' option is broken

[Joshua Leung]

Revision: 46678
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46678
Author:   aligorith
Date:     2012-05-16 02:40:14 +0000 (Wed, 16 May 2012)
Log Message:
-----------
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).

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
    trunk/blender/source/blender/makesrna/intern/rna_armature.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py	2012-05-16 00:51:36 UTC (rev 46677)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py	2012-05-16 02:40:14 UTC (rev 46678)
@@ -356,10 +356,7 @@
         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'}
     _property_type = bpy.types.Bone, bpy.types.EditBone, bpy.types.PoseBone

Modified: trunk/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_armature.c	2012-05-16 00:51:36 UTC (rev 46677)
+++ trunk/blender/source/blender/makesrna/intern/rna_armature.c	2012-05-16 02:40:14 UTC (rev 46678)
@@ -492,10 +492,12 @@
 	                         "(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);