[Bf-blender-cvs] [d6531a5] master: Fix T47302: Crash when OSL active with a viewport on rendered

[Sergey Sharybin]

Commit: d6531a56623b7e037bf3dd5d40462568ecb60301
Author: Sergey Sharybin
Date:   Wed Feb 3 12:10:00 2016 +0100
Branches: master
https://developer.blender.org/rBd6531a56623b7e037bf3dd5d40462568ecb60301

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).

===================================================================

M	intern/cycles/render/osl.cpp

===================================================================

diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 022db16..bd53ff9 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;
 	}