From d6531a56623b7e037bf3dd5d40462568ecb60301 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 3 Feb 2016 12:10:00 +0100 Subject: [PATCH] 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). --- intern/cycles/render/osl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; }