diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-06 09:50:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-06 09:50:59 +0300 |
| commit | b41d34040b45b6634c3e81c93003326a3bf1d49a (patch) | |
| tree | 057360c7f476a25c99df9ba790a64968bdeec195 /source/blender/gpu/intern/gpu_draw.c | |
| parent | 518e7685790f28789bbe795f370ee3b1a5f776c6 (diff) | |
| parent | 47b7f06d0e13efba04290d4cfa8c28d2342eebf7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 601de2249f5..1ab1cba2504 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -579,10 +579,10 @@ int GPU_verify_image( if (do_color_management) { srgb_frect = MEM_mallocN(ibuf->x * ibuf->y * sizeof(float) * 4, "floar_buf_col_cor"); gpu_verify_high_bit_srgb_buffer(srgb_frect, ibuf); - frect = srgb_frect + texwinsy * ibuf->x + texwinsx; + frect = srgb_frect + (4 * (texwinsy * ibuf->x + texwinsx)); } else { - frect = ibuf->rect_float + texwinsy * ibuf->x + texwinsx; + frect = ibuf->rect_float + (ibuf->channels * (texwinsy * ibuf->x + texwinsx)); } } else { |