[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23895] trunk/blender: bisplay shapekeys as sliders in the dope sheet editor

[Campbell Barton]

Revision: 23895
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23895
Author:   campbellbarton
Date:     2009-10-16 20:03:38 +0200 (Fri, 16 Oct 2009)

Log Message:
-----------
bisplay shapekeys as sliders in the dope sheet editor

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/buttons_data_mesh.py
    trunk/blender/source/blender/editors/animation/anim_channels_defines.c
    trunk/blender/source/blender/makesrna/intern/rna_key.c

Modified: trunk/blender/release/scripts/ui/buttons_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_data_mesh.py	2009-10-16 16:09:57 UTC (rev 23894)
+++ trunk/blender/release/scripts/ui/buttons_data_mesh.py	2009-10-16 18:03:38 UTC (rev 23895)
@@ -146,7 +146,7 @@
 					
 					row = layout.row()
 					row.enabled = ob.shape_key_lock == False
-					row.itemR(kb, "value", slider=True)
+					row.itemR(kb, "value")
 					row.itemO("object.shape_key_clear", icon='ICON_X', text="")
 					
 					split = layout.split()

Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2009-10-16 16:09:57 UTC (rev 23894)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2009-10-16 18:03:38 UTC (rev 23895)
@@ -2147,7 +2147,7 @@
 // XXX hardcoded size of icons
 #define ICON_WIDTH		17
 // XXX hardcoded width of sliders
-#define SLIDER_WIDTH	70
+#define SLIDER_WIDTH	80
 
 /* Draw the given channel */
 // TODO: make this use UI controls for the buttons

Modified: trunk/blender/source/blender/makesrna/intern/rna_key.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_key.c	2009-10-16 16:09:57 UTC (rev 23894)
+++ trunk/blender/source/blender/makesrna/intern/rna_key.c	2009-10-16 18:03:38 UTC (rev 23895)
@@ -363,7 +363,7 @@
 	RNA_def_property_update(prop, 0, "rna_Key_update_data");
 	
 	/* for now, this is editable directly, as users can set this even if they're not animating them (to test results) */
-	prop= RNA_def_property(srna, "value", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "value", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "curval");
 	RNA_def_property_float_funcs(prop, NULL, "rna_ShapeKey_value_set", "rna_ShapeKey_value_range");
 	RNA_def_property_ui_text(prop, "Value", "Value of shape key at the current frame.");