[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13580] trunk/blender/source: This is patch: [#8228] Add MultiLayer image type to python and batch rendering

[Kent Mein]

Revision: 13580
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13580
Author:   sirdude
Date:     2008-02-05 20:31:21 +0100 (Tue, 05 Feb 2008)

Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/sceneRender.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/python/api2_2x/sceneRender.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/sceneRender.c	2008-02-05 18:11:16 UTC (rev 13579)
+++ trunk/blender/source/blender/python/api2_2x/sceneRender.c	2008-02-05 19:31:21 UTC (rev 13580)
@@ -994,6 +994,7 @@
 #endif
 #ifdef WITH_OPENEXR
 	case R_OPENEXR :
+	case R_MULTILAYER :
 #endif
 #ifdef WITH_FFMPEG
 	case R_FFMPEG :
@@ -3720,6 +3721,7 @@
 	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 );

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2008-02-05 18:11:16 UTC (rev 13579)
+++ trunk/blender/source/creator/creator.c	2008-02-05 19:31:21 UTC (rev 13580)
@@ -198,7 +198,7 @@
 	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 @@
 						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;