[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56376] trunk/blender/source/blender/ editors/space_image/image_ops.c: Fix #35139] Output panel options are not taken into account when you safe your render (JPG)

[Sergey Sharybin]

Revision: 56376
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56376
Author:   nazgul
Date:     2013-04-29 09:56:01 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
Fix #35139] Output panel options are not taken into account when you safe your render (JPG)

Was caused by svn rev53181, and it worked before because
image buffer didn't have quality set and in this case
fall back to scene settings happened.

Now or render result quality from scene settings is always
used, image buffer's settings is ignored.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53181

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	2013-04-29 08:59:38 UTC (rev 56375)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2013-04-29 09:56:01 UTC (rev 56376)
@@ -1218,14 +1218,17 @@
 			simopts->im_format = scene->r.im_format;
 			is_depth_set = TRUE;
 		}
-		else if (ima->source == IMA_SRC_GENERATED) {
-			simopts->im_format.imtype = R_IMF_IMTYPE_PNG;
-		}
 		else {
-			BKE_imbuf_to_image_format(&simopts->im_format, ibuf);
+			if (ima->source == IMA_SRC_GENERATED) {
+				simopts->im_format.imtype = R_IMF_IMTYPE_PNG;
+			}
+			else {
+				BKE_imbuf_to_image_format(&simopts->im_format, ibuf);
+				simopts->im_format.quality = ibuf->ftype & 0xff;
+			}
+			simopts->im_format.quality = ibuf->ftype & 0xff;
 		}
 		//simopts->subimtype = scene->r.subimtype; /* XXX - this is lame, we need to make these available too! */
-		simopts->im_format.quality = ibuf->ftype & 0xff;
 
 		BLI_strncpy(simopts->filepath, ibuf->name, sizeof(simopts->filepath));