diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-03-07 05:04:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-03-07 05:04:30 +0300 |
commit | c052a5bc36aee7e81de8fa99596c17f38c708ed5 (patch) | |
tree | 384c2c766410ab38e0fd9c468d2a060c400a2954 /source | |
parent | c3c16603d26e7a25ebb578b91ca9a80596657ebd (diff) |
mplayer preset, plays back movies and image sequences.
added scene.render.is_movie_format
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 11 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index ea7a81e8018..ca42ff12531 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -369,6 +369,12 @@ static int rna_RenderSettings_threads_get(PointerRNA *ptr) return BLI_system_thread_count(); } +static int rna_RenderSettings_is_movie_fomat_get(PointerRNA *ptr) +{ + RenderData *rd= (RenderData*)ptr->data; + return BKE_imtype_is_movie(rd->imtype); +} + static int rna_RenderSettings_save_buffers_get(PointerRNA *ptr) { RenderData *rd= (RenderData*)ptr->data; @@ -2321,6 +2327,11 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_struct_name_property(srna, prop); RNA_def_property_clear_flag(prop, PROP_EDITABLE); + prop= RNA_def_property(srna, "is_movie_format", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_is_movie_fomat_get", NULL); + RNA_def_property_clear_flag(prop, PROP_EDITABLE); + RNA_def_property_ui_text(prop, "Movie Format", "When true the format is a movie"); + prop= RNA_def_property(srna, "free_image_textures", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FREE_IMAGE); RNA_def_property_ui_text(prop, "Free Image Textures", "Free all image texture from memory after render, to save memory before compositing"); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index a71c809af84..0e8dae480a3 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2564,6 +2564,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) {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"}, + {5, "MPLAYER", 0, "MPlayer", "Media player for video & png/jpeg/sgi image sequences"}, {50, "CUSTOM", 0, "Custom", "Custom animation player executable path"}, {0, NULL, 0, NULL, NULL}}; |