[Bf-blender-cvs] [4838a60] master: Fix T37703: Shadow pass output image is mangled.

Sergey Sharybin noreply at git.blender.org
Thu Dec 5 12:32:13 CET 2013


Commit: 4838a60b0c389292d701ec394b1204a168be7e21
Author: Sergey Sharybin
Date:   Thu Dec 5 17:31:01 2013 +0600
http://developer.blender.org/rB4838a60b0c389292d701ec394b1204a168be7e21

Fix T37703: Shadow pass output image is mangled.

Was a mistake in own optimization commit.

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

M	source/blender/imbuf/intern/colormanagement.c

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

diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 3542e99..3c1a96e 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -1420,6 +1420,7 @@ static void *do_display_buffer_apply_thread(void *handle_v)
 			                    (height - SCANLINE_BLOCK_SIZE * i) :
 			                    SCANLINE_BLOCK_SIZE;
 			int scanline_offset = channels * start_scanline * width;
+			int scanline_offset4 = 4 * start_scanline * width;
 			bool is_straight_alpha, predivide;
 
 			display_buffer_apply_get_linear_buffer(handle, start_scanline, num_scanlines,
@@ -1440,7 +1441,7 @@ static void *do_display_buffer_apply_thread(void *handle_v)
 			/* copy result to output buffers */
 			if (display_buffer_byte) {
 				/* do conversion */
-				IMB_buffer_byte_from_float(display_buffer_byte + scanline_offset, linear_buffer,
+				IMB_buffer_byte_from_float(display_buffer_byte + scanline_offset4, linear_buffer,
 				                           channels, dither, IB_PROFILE_SRGB, IB_PROFILE_SRGB,
 				                           predivide, width, num_scanlines, width, width);
 			}




More information about the Bf-blender-cvs mailing list