diff options
| author | Joshua Leung <aligorith@gmail.com> | 2012-05-17 14:10:11 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2012-05-17 14:10:11 +0400 |
| commit | c7c937547b0ceb622262ea064db71364f61669c6 (patch) | |
| tree | 85fd6d69e1201997f0ccbeb7ef2abcb95b55003c | |
| parent | c406ce29742fd44995f29768e593f00a7805df2c (diff) | |
KeyingSets UI stuff - Replaced names used in RNA enum instead of redefining
manually in UI files
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 12 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 6 |
2 files changed, 5 insertions, 13 deletions
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 329dc6d6a01..af8fcc6cbdc 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -93,14 +93,6 @@ class SCENE_PT_unit(SceneButtonsPanel, Panel): 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 @@ class SCENE_PT_keying_sets(SceneButtonsPanel, Panel): 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 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel): 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): diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 7a8f48705a4..459482063b1 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -468,11 +468,11 @@ static void rna_def_common_keying_flags(StructRNA *srna, short reg) 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} |