[Bf-blender-cvs] [36370d5] blender-v2.75-release: Fix T45237: Dither does not work

Dalai Felinto noreply at git.blender.org
Tue Jul 7 15:17:37 CEST 2015


Commit: 36370d56c255e5b1783dc55075c2ec21700650ea
Author: Dalai Felinto
Date:   Mon Jul 6 11:51:40 2015 -0300
Branches: blender-v2.75-release
https://developer.blender.org/rB36370d56c255e5b1783dc55075c2ec21700650ea

Fix T45237: Dither does not work

===================================================================

M	source/blender/blenkernel/intern/image.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 77256d3..a618d72 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3676,18 +3676,20 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **r_loc
 			}
 
 			if (rpass) {
-				channels = rpass->channels;
 				rectf = rpass->rect;
-
-				if (!rectf) {
-					/* Happens when Save Buffers is enabled.
-					 * Use display buffer stored in the render layer.
-					 */
-					rect = (unsigned int *) rl->display_buffer;
-					byte_buffer_in_display_space = true;
+				if (passtype == SCE_PASS_COMBINED) {
+					if (rectf == NULL) {
+						/* Happens when Save Buffers is enabled.
+						 * Use display buffer stored in the render layer.
+						 */
+						rect = (unsigned int *) rl->display_buffer;
+						byte_buffer_in_display_space = true;
+					}
+				}
+				else {
+					channels = rpass->channels;
+					dither = 0.0f; /* don't dither passes */
 				}
-
-				dither = 0.0f; /* don't dither passes */
 			}
 
 			for (rpass = rl->passes.first; rpass; rpass = rpass->next)




More information about the Bf-blender-cvs mailing list