diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_userdef.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index de78be51290..0f6a5361277 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -29,8 +29,8 @@ #include "rna_internal.h" +#include "DNA_curve_types.h" #include "DNA_userdef_types.h" -#include "DNA_ipo_types.h" #ifdef RNA_RUNTIME @@ -365,9 +365,9 @@ static void rna_def_userdef_theme_space_ipo(BlenderRNA *brna) /* space_ipo */ - srna= RNA_def_struct(brna, "ThemeIpoEditor", NULL); + srna= RNA_def_struct(brna, "ThemeGraphEditor", NULL); RNA_def_struct_sdna(srna, "ThemeSpace"); - RNA_def_struct_ui_text(srna, "Theme Ipo Editor", "Theme settings for the Ipo Editor."); + RNA_def_struct_ui_text(srna, "Theme Graph Editor", "Theme settings for the Ipo Editor."); rna_def_userdef_theme_spaces_main(srna); @@ -384,10 +384,10 @@ static void rna_def_userdef_theme_space_ipo(BlenderRNA *brna) RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Window Sliders", ""); - prop= RNA_def_property(srna, "ipo_channels", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "channels_region", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "shade2"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Ipo Channels", ""); + RNA_def_property_ui_text(prop, "Channels Region", ""); rna_def_userdef_theme_spaces_vertex(srna); @@ -764,9 +764,9 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna) /* space_action */ - srna= RNA_def_struct(brna, "ThemeActionEditor", NULL); + srna= RNA_def_struct(brna, "ThemeDopeSheetEditor", NULL); RNA_def_struct_sdna(srna, "ThemeSpace"); - RNA_def_struct_ui_text(srna, "Theme Action Editor", "Theme settings for the Action Editor."); + RNA_def_struct_ui_text(srna, "Theme DopeSheet Editor", "Theme settings for the DopeSheet Editor."); rna_def_userdef_theme_spaces_main(srna); @@ -774,10 +774,10 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna) RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Grid", ""); - prop= RNA_def_property(srna, "rvk_sliders", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "value_sliders", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "face"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "RVK Sliders", ""); + RNA_def_property_ui_text(prop, "Value Sliders", ""); prop= RNA_def_property(srna, "view_sliders", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "shade1"); @@ -818,6 +818,16 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "cframe"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Current Frame", ""); + + prop= RNA_def_property(srna, "dopesheet_channel", PROP_FLOAT, PROP_COLOR); + RNA_def_property_float_sdna(prop, NULL, "ds_channel"); + RNA_def_property_array(prop, 3); + RNA_def_property_ui_text(prop, "DopeSheet Channel", ""); + + prop= RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR); + RNA_def_property_float_sdna(prop, NULL, "ds_subchannel"); + RNA_def_property_array(prop, 3); + RNA_def_property_ui_text(prop, "DopeSheet Sub-Channel", ""); } static void rna_def_userdef_theme_space_nla(BlenderRNA *brna) @@ -919,10 +929,10 @@ static void rna_def_userdef_themes(BlenderRNA *brna) RNA_def_property_struct_type(prop, "ThemeView3D"); RNA_def_property_ui_text(prop, "3D View", ""); - prop= RNA_def_property(srna, "ipo_curve_editor", PROP_POINTER, PROP_NEVER_NULL); + prop= RNA_def_property(srna, "graph_editor", PROP_POINTER, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "tipo"); - RNA_def_property_struct_type(prop, "ThemeIpoEditor"); - RNA_def_property_ui_text(prop, "Ipo Curve Editor", ""); + RNA_def_property_struct_type(prop, "ThemeGraphEditor"); + RNA_def_property_ui_text(prop, "Graph Editor", ""); prop= RNA_def_property(srna, "file_browser", PROP_POINTER, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "tfile"); @@ -934,10 +944,10 @@ static void rna_def_userdef_themes(BlenderRNA *brna) RNA_def_property_struct_type(prop, "ThemeNLAEditor"); RNA_def_property_ui_text(prop, "NLA Editor", ""); - prop= RNA_def_property(srna, "action_editor", PROP_POINTER, PROP_NEVER_NULL); + prop= RNA_def_property(srna, "dopesheet_editor", PROP_POINTER, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "tact"); - RNA_def_property_struct_type(prop, "ThemeActionEditor"); - RNA_def_property_ui_text(prop, "Action Editor", ""); + RNA_def_property_struct_type(prop, "ThemeDopeSheetEditor"); + RNA_def_property_ui_text(prop, "DopeSheet Editor", ""); prop= RNA_def_property(srna, "image_editor", PROP_POINTER, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "tima"); @@ -1271,10 +1281,10 @@ static void rna_def_userdef_edit(BlenderRNA *brna) {AUTOKEY_MODE_EDITKEYS, "REPLACE_KEYS", "Replace Keys", ""}, {0, NULL, NULL, NULL}}; - static EnumPropertyItem new_ipo_curve_types[] = { - {IPO_CONST, "CONSTANT", "Constant", ""}, - {IPO_LIN, "LINEAR", "Linear", ""}, - {IPO_BEZ, "BEZIER", "Bezier", ""}, + static EnumPropertyItem new_interpolation_types[] = { + {BEZT_IPO_CONST, "CONSTANT", "Constant", ""}, + {BEZT_IPO_LIN, "LINEAR", "Linear", ""}, + {BEZT_IPO_BEZ, "BEZIER", "Bezier", ""}, {0, NULL, NULL, NULL}}; srna= RNA_def_struct(brna, "UserPreferencesEdit", NULL); @@ -1339,7 +1349,7 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Visual Keying", "Use Visual keying automatically for constrained objects."); prop= RNA_def_property(srna, "new_interpolation_type", PROP_ENUM, PROP_NONE); - RNA_def_property_enum_items(prop, new_ipo_curve_types); + RNA_def_property_enum_items(prop, new_interpolation_types); RNA_def_property_enum_sdna(prop, NULL, "ipo_new"); RNA_def_property_ui_text(prop, "New Interpolation Type", ""); |