Revision: 46718
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46718
Author: aligorith
Date: 2012-05-17 10:10:11 +0000 (Thu, 17 May 2012)
Log Message:
-----------
KeyingSets UI stuff - Replaced names used in RNA enum instead of redefining
manually in UI files
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
trunk/blender/source/blender/makesrna/intern/rna_animation.c
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
2012-05-17 10:07:29 UTC (rev 46717)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
2012-05-17 10:10:11 UTC (rev 46718)
@@ -93,14 +93,6 @@
row.prop(unit, "use_separate")
-def draw_keyingset_options(data, layout):
- # NOTE: keep in sync with rna_def_common_keying_flags() in rna_animation.c
- # These are defined out like this because the standard names are too long
- layout.prop_enum(data, "bl_options", text="Only Needed",
value='INSERTKEY_NEEDED')
- layout.prop_enum(data, "bl_options", text="Visual Keying",
value='INSERTKEY_VISUAL')
- layout.prop_enum(data, "bl_options", text="XYZ=RGB Coloring",
value='INSERTKEY_XYZ_TO_RGB')
-
-
class SCENE_PT_keying_sets(SceneButtonsPanel, Panel):
bl_label = "Keying Sets"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -132,7 +124,7 @@
col = row.column(align=True)
col.label(text="Keyframing Settings:")
- draw_keyingset_options(ks, col)
+ col.prop(ks, "bl_options")
class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel):
@@ -188,7 +180,7 @@
col = row.column(align=True)
col.label(text="Keyframing Settings:")
- draw_keyingset_options(ks, col)
+ col.prop(ksp, "bl_options")
class SCENE_PT_physics(SceneButtonsPanel, Panel):
Modified: trunk/blender/source/blender/makesrna/intern/rna_animation.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animation.c
2012-05-17 10:07:29 UTC (rev 46717)
+++ trunk/blender/source/blender/makesrna/intern/rna_animation.c
2012-05-17 10:10:11 UTC (rev 46718)
@@ -468,11 +468,11 @@
PropertyRNA *prop;
static EnumPropertyItem keying_flag_items[] = {
- {INSERTKEY_NEEDED, "INSERTKEY_NEEDED", 0, "Insert Keyframes -
Only Needed",
+ {INSERTKEY_NEEDED, "INSERTKEY_NEEDED", 0, "Only Needed",
"Only insert keyframes where they're needed
in the relevant F-Curves"},
- {INSERTKEY_MATRIX, "INSERTKEY_VISUAL", 0, "Insert Keyframes -
Visual",
+ {INSERTKEY_MATRIX, "INSERTKEY_VISUAL", 0, "Visual Keying",
"Insert keyframes based on 'visual
transforms'"},
- {INSERTKEY_XYZ2RGB, "INSERTKEY_XYZ_TO_RGB", 0, "F-Curve Colors
- XYZ to RGB",
+ {INSERTKEY_XYZ2RGB, "INSERTKEY_XYZ_TO_RGB", 0, "XYZ=RGB Colors",
"Color for newly added transformation
F-Curves (Location, Rotation, Scale) "
"and also Color is based on the transform
axis"},
{0, NULL, 0, NULL, NULL}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
