[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41483] trunk/blender/source/blender/ editors/space_image/image_ops.c: fix regression [#29076] 16bit Tiff save broken in Blender 2.60

[Campbell Barton]

Revision: 41483
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41483
Author:   campbellbarton
Date:     2011-11-03 03:51:48 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
fix regression [#29076] 16bit Tiff save broken in Blender 2.60

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_ops.c

Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c	2011-11-03 03:00:45 UTC (rev 41482)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2011-11-03 03:51:48 UTC (rev 41483)
@@ -1009,11 +1009,17 @@
 	return (ibuf != NULL);
 }
 
-static void save_image_options_from_op(SaveImageOptions *simopts, wmOperator *op)
+static void save_image_options_from_op(SaveImageOptions *simopts, wmOperator *op, Scene *evil_scene)
 {
 	if (RNA_property_is_set(op->ptr, "color_mode")) simopts->planes= RNA_enum_get(op->ptr, "color_mode");
 	if (RNA_property_is_set(op->ptr, "file_format")) simopts->imtype= RNA_enum_get(op->ptr, "file_format");
-	// if (RNA_property_is_set(op->ptr, "subimtype")) simopts->subimtype= RNA_enum_get(op->ptr, "subimtype"); // XXX
+
+#if 0
+	if (RNA_property_is_set(op->ptr, "subimtype")) simopts->subimtype= RNA_enum_get(op->ptr, "subimtype"); // XXX
+#else
+	simopts->subimtype= evil_scene->r.subimtype;
+#endif
+
 	if (RNA_property_is_set(op->ptr, "file_quality")) simopts->quality= RNA_int_get(op->ptr, "file_quality");
 
 	if (RNA_property_is_set(op->ptr, "filepath")) {
@@ -1141,7 +1147,7 @@
 	/* just incase to initialize values,
 	 * these should be set on invoke or by the caller. */
 	save_image_options_defaults(&simopts);
-	save_image_options_from_op(&simopts, op);
+	save_image_options_from_op(&simopts, op, CTX_data_scene(C));
 
 	save_image_doit(C, sima, op, &simopts, TRUE);
 
@@ -1225,7 +1231,7 @@
 
 	if (save_image_options_init(&simopts, sima, scene, FALSE) == 0)
 		return OPERATOR_CANCELLED;
-	save_image_options_from_op(&simopts, op);
+	save_image_options_from_op(&simopts, op, scene);
 
 	if (BLI_exists(simopts.filepath) && BLI_file_is_writable(simopts.filepath)) {
 		save_image_doit(C, sima, op, &simopts, FALSE);