diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-03 14:10:00 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-03 14:11:23 +0300 |
| commit | d6531a56623b7e037bf3dd5d40462568ecb60301 (patch) | |
| tree | 20c7480f6b9850e7323c222ebea775500ef40701 /intern/cycles/render/osl.cpp | |
| parent | 2a65acc952205aaa1ac950d4ee46373a0c4df329 (diff) | |
Fix T47302: Crash when OSL active with a viewport on rendered
Only happened when rendering second time with OSL enabled.
Was caused by fix for T47201. Hopefully now all the issues
are solved (meaning, we don't keep files opened and don't
crash either).
Diffstat (limited to 'intern/cycles/render/osl.cpp')
| -rw-r--r-- | intern/cycles/render/osl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 022db16f2f5..bd53ff90bb9 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -186,7 +186,8 @@ void OSLShaderManager::texture_system_free() ts_shared_users--; if(ts_shared_users == 0) { - OSL::TextureSystem::destroy(ts_shared, true); + ts_shared->invalidate_all(true); + OSL::TextureSystem::destroy(ts_shared); ts_shared = NULL; } |