diff options
| author | Kent Mein <mein@cs.umn.edu> | 2008-02-05 22:31:21 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2008-02-05 22:31:21 +0300 |
| commit | 37d139ea54029589b34807c59f0108d51b415ef3 (patch) | |
| tree | 3404404e728047f27ae641e4aca8d6e51048718d /source | |
| parent | 217b3647b1a1d56390b0795a59c7f82bc6e1d93a (diff) | |
This is patch: [#8228] Add MultiLayer image type to python and batch rendering
Submitted By: Stephane SOPPERA (soppera)
Also fixes a small typo with wrong filetype for TIFF commandline rendering.
Kent
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/python/api2_2x/sceneRender.c | 2 | ||||
| -rw-r--r-- | source/creator/creator.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c index 9b96d4aa12a..581c6132581 100644 --- a/source/blender/python/api2_2x/sceneRender.c +++ b/source/blender/python/api2_2x/sceneRender.c @@ -994,6 +994,7 @@ static int RenderData_setImageType( BPy_RenderData *self, PyObject *value ) #endif #ifdef WITH_OPENEXR case R_OPENEXR : + case R_MULTILAYER : #endif #ifdef WITH_FFMPEG case R_FFMPEG : @@ -3720,6 +3721,7 @@ PyObject *Render_Init( void ) PyModule_AddIntConstant( submodule, "SKYDOME", PY_SKYDOME ); PyModule_AddIntConstant( submodule, "GIFULL", PY_FULL ); PyModule_AddIntConstant( submodule, "OPENEXR", R_OPENEXR ); + PyModule_AddIntConstant( submodule, "MULTILAYER", R_MULTILAYER ); PyModule_AddIntConstant( submodule, "TIFF", R_TIFF ); PyModule_AddIntConstant( submodule, "FFMPEG", R_FFMPEG ); PyModule_AddIntConstant( submodule, "CINEON", R_CINEON ); diff --git a/source/creator/creator.c b/source/creator/creator.c index 7c7e81b5b45..4dd1350ea48 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -198,7 +198,7 @@ static void print_help(void) printf (" \tTGA IRIS HAMX JPEG MOVIE IRIZ RAWTGA\n"); printf (" \tAVIRAW AVIJPEG PNG BMP FRAMESERVER\n"); printf (" (formats that can be compiled into blender, not available on all systems)\n"); - printf (" \tHDR TIFF EXR MPEG AVICODEC QUICKTIME CINEON DPX DDS\n"); + printf (" \tHDR TIFF EXR MULTILAYER MPEG AVICODEC QUICKTIME CINEON DPX DDS\n"); printf (" -x <bool>\tSet option to add the file extension to the end of the file.\n"); printf (" -t <threads>\tUse amount of <threads> for rendering\n"); /*Add these later - Campbell*/ @@ -674,9 +674,10 @@ int main(int argc, char **argv) else if (!strcmp(argv[a],"QUICKTIME")) G.scene->r.imtype = R_QUICKTIME; else if (!strcmp(argv[a],"BMP")) G.scene->r.imtype = R_BMP; else if (!strcmp(argv[a],"HDR")) G.scene->r.imtype = R_RADHDR; - else if (!strcmp(argv[a],"TIFF")) G.scene->r.imtype = R_IRIS; + else if (!strcmp(argv[a],"TIFF")) G.scene->r.imtype = R_TIFF; #ifdef WITH_OPENEXR else if (!strcmp(argv[a],"EXR")) G.scene->r.imtype = R_OPENEXR; + else if (!strcmp(argv[a],"MULTILAYER")) G.scene->r.imtype = R_MULTILAYER; #endif else if (!strcmp(argv[a],"MPEG")) G.scene->r.imtype = R_FFMPEG; else if (!strcmp(argv[a],"FRAMESERVER")) G.scene->r.imtype = R_FRAMESERVER; |