diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-12 22:43:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-12 22:45:47 +0300 |
| commit | e568c1a9757a5d4f8a52822cbbe772d0ac4da78b (patch) | |
| tree | 893da9749afdf2d61bfc9a2a040ef4f57c33a7a7 /intern/cycles/render | |
| parent | ebcb88037581a28a776bca98618d780ea1997301 (diff) | |
Fix T53289: CUDA missing textures not showing pink, after recent changes.
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/image.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 9358b40a689..482442cce29 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -723,6 +723,7 @@ void ImageManager::device_load_image(Device *device, *tex_img)) { /* on failure to load, we set a 1x1 pixels pink image */ + thread_scoped_lock device_lock(device_mutex); float *pixels = (float*)tex_img->alloc(1, 1); pixels[0] = TEX_IMAGE_MISSING_R; @@ -748,6 +749,7 @@ void ImageManager::device_load_image(Device *device, *tex_img)) { /* on failure to load, we set a 1x1 pixels pink image */ + thread_scoped_lock device_lock(device_mutex); float *pixels = (float*)tex_img->alloc(1, 1); pixels[0] = TEX_IMAGE_MISSING_R; @@ -770,6 +772,7 @@ void ImageManager::device_load_image(Device *device, *tex_img)) { /* on failure to load, we set a 1x1 pixels pink image */ + thread_scoped_lock device_lock(device_mutex); uchar *pixels = (uchar*)tex_img->alloc(1, 1); pixels[0] = (TEX_IMAGE_MISSING_R * 255); @@ -794,6 +797,7 @@ void ImageManager::device_load_image(Device *device, texture_limit, *tex_img)) { /* on failure to load, we set a 1x1 pixels pink image */ + thread_scoped_lock device_lock(device_mutex); uchar *pixels = (uchar*)tex_img->alloc(1, 1); pixels[0] = (TEX_IMAGE_MISSING_R * 255); @@ -815,6 +819,7 @@ void ImageManager::device_load_image(Device *device, texture_limit, *tex_img)) { /* on failure to load, we set a 1x1 pixels pink image */ + thread_scoped_lock device_lock(device_mutex); half *pixels = (half*)tex_img->alloc(1, 1); pixels[0] = TEX_IMAGE_MISSING_R; @@ -839,6 +844,7 @@ void ImageManager::device_load_image(Device *device, texture_limit, *tex_img)) { /* on failure to load, we set a 1x1 pixels pink image */ + thread_scoped_lock device_lock(device_mutex); half *pixels = (half*)tex_img->alloc(1, 1); pixels[0] = TEX_IMAGE_MISSING_R; |