diff options
| author | Matt Ebb <matt@mke3.net> | 2009-12-14 02:30:18 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-12-14 02:30:18 +0300 |
| commit | 3f612b6ea5b15b0a868f1472053378949722c88a (patch) | |
| tree | a9e90b187efc7f9e2524bb0383f37533b7a264d8 /source/blender | |
| parent | 9f965ba62bc26c8c8f66c473f70d288800aec8d3 (diff) | |
Description and more presets for animation players (rv / framecycler).
Also put a bit more logic for guessing player paths based on my system.
If anyone can make this a bit more clever/bulletproof, please feel free to
get involved in it, it's all python!
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 809b3387f28..b2ae5572a05 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1283,6 +1283,9 @@ void init_userdef_do_versions(void) if (U.dbl_click_time == 0) { U.dbl_click_time = 350; } + if (U.anim_player_preset == 0) { + U.anim_player_preset =1 ; + } /* funny name, but it is GE stuff, moves userdef stuff to engine */ // XXX space_set_commmandline_options(); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 21e601c3ba3..d3329907939 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2360,9 +2360,11 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) static EnumPropertyItem anim_player_presets[] = { //{0, "INTERNAL", 0, "Internal", "Built-in animation player"}, // doesn't work yet! - {0, "BLENDER24", 0, "Blender 2.4", "Blender command line animation playback - path to Blender 2.4"}, + {1, "BLENDER24", 0, "Blender 2.4", "Blender command line animation playback - path to Blender 2.4"}, {2, "DJV", 0, "Djv", "Open source frame player: http://djv.sourceforge.net"}, - {3, "CUSTOM", 0, "Custom", "Custom animation player executable path"}, + {3, "FRAMECYCLER", 0, "FrameCycler", "Frame player from IRIDAS"}, + {4, "RV", 0, "rv", "Frame player from Tweak Software"}, + {50, "CUSTOM", 0, "Custom", "Custom animation player executable path"}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "UserPreferencesFilePaths", NULL); @@ -2430,6 +2432,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "anim_player_preset"); RNA_def_property_enum_items(prop, anim_player_presets); RNA_def_property_ui_text(prop, "Animation Player Preset", "Preset configs for external animation players"); + RNA_def_property_enum_default(prop, 1); /* set default to blender 2.4 player until an internal one is back */ /* Autosave */ |