[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20016] branches/blender2.5/blender: 2. 5 - Restored access to the Image-Type setting

[Joshua Leung]

Revision: 20016
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20016
Author:   aligorith
Date:     2009-05-01 13:57:14 +0200 (Fri, 01 May 2009)

Log Message:
-----------
2.5 - Restored access to the Image-Type setting

This has been wrapped under Scene.RenderData, and can currently be accessed under the 'Image' panel in the Scene settings. 

As in the old code, image types are only included if they are enabled when compiling. Also note that image-type specific settings have not been wrapped yet.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_scene.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c

Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py	2009-05-01 06:24:52 UTC (rev 20015)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py	2009-05-01 11:57:14 UTC (rev 20016)
@@ -50,6 +50,9 @@
 		layout.itemR(rd, "color_mode")
 		
 		layout.row()
+		layout.itemR(rd, "image_type")
+		
+		layout.row()
 		layout.itemR(rd, "placeholders")
 		layout.itemR(rd, "no_overwrite")
 		layout.itemR(rd, "file_extensions")

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-05-01 06:24:52 UTC (rev 20015)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-05-01 11:57:14 UTC (rev 20016)
@@ -210,6 +210,43 @@
 		{0, "THREADS_AUTO", "Auto-detect", ""},
 		{R_FIXED_THREADS, "THREADS_FIXED", "Fixed Number", ""},
 		{0, NULL, NULL, NULL}};
+		
+	static EnumPropertyItem image_type_items[] = {
+		{R_FRAMESERVER, "FRAMESERVER", "Frame Server", ""},
+#ifdef WITH_FFMPEG
+		{R_FFMPEG, "FFMPEG", "FFMpeg", ""},
+#endif
+		{R_AVIRAW, "AVIRAW", "AVI Raw", ""},
+		{R_AVIJPEG, "AVIJPEG", "AVI JPEG", ""},
+#ifdef _WIN32
+		{R_AVICODEC, "AVICODEC", "AVI Codec", ""},
+#endif
+#ifdef WITH_QUICKTIME
+		{R_QUICKTIME, "QUICKTIME", "QuickTime", ""},
+#endif
+		{R_TARGA, "TARGA", "Targa", ""},
+		{R_RAWTGA, "RAWTARGA", "Targa Raw", ""},
+		{R_PNG, "PNG", "PNG", ""},
+		//{R_DDS, "DDS", "DDS", ""}, // XXX not yet implemented
+#ifdef WITH_OPENJPEG
+		{R_JP2, "JPEG2000", "JPEG 2000", ""},
+#endif		
+		{R_BMP, "BMP", "BMP", ""},
+		{R_JPEG90, "JPEG", "JPEG", ""},
+		{R_HAMX, "HAMX", "HamX", ""},
+		{R_IRIS, "IRIS", "Iris", ""},
+		{R_RADHDR, "RADHDR", "Radiance HDR", ""},
+		{R_CINEON, "CINEON", "Cineon", ""},
+		{R_DPX, "DPX", "DPX", ""},
+#ifdef __sgi
+		{R_MOVIE, "MOVIE", "Movie", ""},
+#endif
+#ifdef WITH_OPENEXR
+		{R_OPENEXR, "OPENEXR", "OpenEXR", ""},
+		{R_MULTILAYER, "MULTILAYER", "MultiLayer", ""},
+#endif
+		{R_TIFF, "TIFF", "TIFF", ""},	// XXX only with G.have_libtiff
+		{0, NULL, NULL, NULL}};
 	
 	srna= RNA_def_struct(brna, "SceneRenderData", NULL);
 	RNA_def_struct_sdna(srna, "RenderData");
@@ -439,6 +476,12 @@
 	RNA_def_property_ui_text(prop, "File Extensions", "Add the file format extensions to the rendered file name (eg: filename + .jpg)");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
+	prop= RNA_def_property(srna, "image_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "imtype");
+	RNA_def_property_enum_items(prop, image_type_items);
+	RNA_def_property_ui_text(prop, "Image Type", "File format to save the rendered images as.");
+	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
+	
 	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.");