griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correction to previous commit -- make sure float buffer is not being changed

Browse Source 
while color management transformations are running.
This commit is contained in:
Sergey Sharybin
2012-07-24 12:18:40 +00:00
parent a0bdc54572
commit a6d62e9e87
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/image.c
View File

@@ -2565,7 +2565,6 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
if (ibuf->x != rres.rectx || ibuf->y != rres.recty || ibuf->rect_float != rectf) {
IMB_display_buffer_invalidate(ibuf);
}
BLI_unlock_thread(LOCK_COLORMANAGE);
ibuf->x = rres.rectx;
ibuf->y = rres.recty;
@@ -2602,6 +2601,8 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
ibuf->flags &= ~IB_zbuffloat;
}
BLI_unlock_thread(LOCK_COLORMANAGE);
/* since its possible to access the buffer from the image directly, set the profile [#25073] */
ibuf->profile = (iuser->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) ? IB_PROFILE_LINEAR_RGB : IB_PROFILE_NONE;
ibuf->dither = dither;