[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26991] trunk/blender: rename rna props for auto-keying to be consistant, user prefs were graying out auto key options that were still in use.

[Campbell Barton]

Revision: 26991
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26991
Author:   campbellbarton
Date:     2010-02-17 16:14:09 +0100 (Wed, 17 Feb 2010)

Log Message:
-----------
rename rna props for auto-keying to be consistant, user prefs were graying out auto key options that were still in use.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_time.py
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/makesrna/intern/rna_scene.c
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/release/scripts/ui/space_time.py
===================================================================
--- trunk/blender/release/scripts/ui/space_time.py	2010-02-17 14:09:16 UTC (rev 26990)
+++ trunk/blender/release/scripts/ui/space_time.py	2010-02-17 15:14:09 UTC (rev 26991)
@@ -67,8 +67,8 @@
         row.operator("screen.frame_jump", text="", icon='FF').end = True
 
         row = layout.row(align=True)
-        row.prop(tools, "enable_auto_key", text="", toggle=True, icon='REC')
-        if screen.animation_playing and tools.enable_auto_key:
+        row.prop(tools, "use_auto_keying", text="", toggle=True, icon='REC')
+        if screen.animation_playing and tools.use_auto_keying:
             subsub = row.row()
             subsub.prop(tools, "record_with_nla", toggle=True)
 

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-02-17 14:09:16 UTC (rev 26990)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-02-17 15:14:09 UTC (rev 26991)
@@ -349,23 +349,23 @@
 
         col.separator()
 
-        col.label(text="New F-Curve Defaults:")
-        col.prop(edit, "new_interpolation_type", text="Interpolation")
-        col.prop(edit, "insertkey_xyz_to_rgb", text="XYZ to RGB")
+        col.prop(edit, "use_auto_keying", text="Auto Keyframing:")
 
-        col.separator()
-
-        col.prop(edit, "auto_keying_enable", text="Auto Keyframing:")
-
         sub = col.column()
 
-        sub.active = edit.auto_keying_enable
+        # sub.active = edit.use_auto_keying # incorrect, timeline can enable
         sub.prop(edit, "auto_keyframe_insert_keyingset", text="Only Insert for Keying Set")
         sub.prop(edit, "auto_keyframe_insert_available", text="Only Insert Available")
 
         col.separator()
+
+        col.label(text="New F-Curve Defaults:")
+        col.prop(edit, "new_interpolation_type", text="Interpolation")
+        col.prop(edit, "insertkey_xyz_to_rgb", text="XYZ to RGB")
+
         col.separator()
         col.separator()
+        col.separator()
 
         col.label(text="Transform:")
         col.prop(edit, "drag_immediately")

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-02-17 14:09:16 UTC (rev 26990)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-02-17 15:14:09 UTC (rev 26991)
@@ -844,7 +844,7 @@
 	RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */
 
 	/* Auto Keying */
-	prop= RNA_def_property(srna, "enable_auto_key", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_auto_keying", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "autokey_mode", AUTOKEY_ON);
 	RNA_def_property_ui_text(prop, "Auto Keying", "Automatic keyframe insertion for Objects and Bones");
 	

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-02-17 14:09:16 UTC (rev 26990)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-02-17 15:14:09 UTC (rev 26991)
@@ -2039,7 +2039,7 @@
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOSIZEGRID);
 	RNA_def_property_ui_text(prop, "Enable Scaling Snap", "Snap objects and sub-objects to grid units when scaling");
 
-	prop= RNA_def_property(srna, "auto_keying_enable", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_auto_keying", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "autokey_mode", AUTOKEY_ON);
 	RNA_def_property_ui_text(prop, "Auto Keying Enable", "Automatic keyframe insertion for Objects and Bones");