Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-12-05 15:31:01 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-12-05 15:31:53 +0400
commit4838a60b0c389292d701ec394b1204a168be7e21 (patch)
treee5df5239ff89aeef3d4459d05d7d6f744ed485d3 /source/blender/imbuf
parentc17266ff548a28b1d848b84f90300bb3dbc60379 (diff)
Fix T37703: Shadow pass output image is mangled.
Was a mistake in own optimization commit.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/colormanagement.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 3542e999f02..3c1a96e4005 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);
}