diff options
author | Thomas Dinges <blender@dingto.org> | 2013-12-14 12:24:22 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-12-14 12:24:22 +0400 |
commit | 3517cde0fb5ba67b008691335118ea2255d4a7af (patch) | |
tree | 91748017f237860fcd70e5d5f5873e30d600eb9c | |
parent | 92afb52ebd46852e799ff583486e92537f8e9874 (diff) |
Code cleanup: Remove Blender 2.4x animation player preset, since we have the internal one.
-rw-r--r-- | release/scripts/startup/bl_operators/screen_play_rendered_anim.py | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py index 04c28500089..3a7a9b99cde 100644 --- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -121,7 +121,7 @@ class PlayRenderedAnim(Operator): else: frame_start = scene.frame_start frame_end = scene.frame_end - if preset in {'BLENDER24', 'INTERNAL'}: + if preset == 'INTERNAL': opts = ["-a", "-f", str(rd.fps), str(rd.fps_base), "-s", str(frame_start), diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 650ca42f05b..9af1de4317b 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -4045,7 +4045,6 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) static EnumPropertyItem anim_player_presets[] = { {0, "INTERNAL", 0, "Internal", "Built-in animation player"}, - {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, "FRAMECYCLER", 0, "FrameCycler", "Frame player from IRIDAS"}, {4, "RV", 0, "rv", "Frame player from Tweak Software"}, @@ -4141,7 +4140,6 @@ 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 */ |