Merge branch 'blender2.7'

3 files changed, 10 insertions, 0 deletions

diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 3fbc7d33a74..c603dc69a16 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -66,6 +66,10 @@ OSLShaderManager::~OSLShaderManager()
 {
 	shading_system_free();
 	texture_system_free();
+}
+
+void OSLShaderManager::free_memory()
+{
 #ifdef OSL_HAS_BLENDER_CLEANUP_FIX
 	/* There is a problem with llvm+osl: The order global destructors across
 	 * different compilation units run cannot be guaranteed, on windows this means
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h
index e196e0be787..93cc3139608 100644
--- a/intern/cycles/render/osl.h
+++ b/intern/cycles/render/osl.h
@@ -70,6 +70,8 @@ public:
 	OSLShaderManager();
 	~OSLShaderManager();
 
+	static void free_memory();
+
 	void reset(Scene *scene);
 
 	bool use_osl() { return true; }
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index a1a9cfd25f3..21bac460255 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -693,6 +693,10 @@ void ShaderManager::get_requested_features(Scene *scene,
 void ShaderManager::free_memory()
 {
 	beckmann_table.free_memory();
+
+#ifdef WITH_OSL
+	OSLShaderManager::free_memory();
+#endif
 }
 
 float ShaderManager::linear_rgb_to_gray(float3 c)