bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix T47120: CPU OSL Cycles crashes blender in latest GIT

Browse Source 
The issue was caused by leaking error messages caused by
getting OIIO texture handle for built-in images.
This commit is contained in:
Sergey Sharybin 2016-01-06 23:06:54 +05:00
parent 944b6322e6
commit 03302fd5ed
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/kernel/osl/osl_services.cpp
View File

@ -858,8 +858,10 @@ bool OSLRenderServices::texture(ustring filename,
OSLThreadData *tdata = kg->osl_tdata;
OIIO::TextureSystem::Perthread *texture_thread_info =
tdata->oiio_thread_info;
OIIO::TextureSystem::TextureHandle *texture_handle =
ts->get_texture_handle(filename, texture_thread_info);
OIIO::TextureSystem::TextureHandle *texture_handle = NULL;
if(filename[0] != '@') {
texture_handle = ts->get_texture_handle(filename, texture_thread_info);
}
return texture(filename,
texture_handle,
texture_thread_info,
@ -887,8 +889,10 @@ bool OSLRenderServices::texture3d(ustring filename,
OSLThreadData *tdata = kg->osl_tdata;
OIIO::TextureSystem::Perthread *texture_thread_info =
tdata->oiio_thread_info;
OIIO::TextureSystem::TextureHandle *texture_handle =
ts->get_texture_handle(filename, texture_thread_info);
OIIO::TextureSystem::TextureHandle *texture_handle = NULL;
if(filename[0] != '@') {
texture_handle = ts->get_texture_handle(filename, texture_thread_info);
}
return texture3d(filename,
texture_handle,
texture_thread_info,