Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-13 20:26:11 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-13 20:31:12 +0300
commit1be16466e7983edbe8794127141267a8099d54be (patch)
treef5178ac6ff840d8a2748e620c9a583613e44f0fe /intern/cycles/render/shader.cpp
parent6a8d87db1879cc1bf96217987b52a4be2c80864c (diff)
Fix T60434: crash with OSL and viewport + preview render at the same time.
Don't free LLVM JIT memory until process exit, there might be multiple OSL instances using it.
Diffstat (limited to 'intern/cycles/render/shader.cpp')
-rw-r--r--intern/cycles/render/shader.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 3ee63e91e8d..9f256a665cd 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -692,6 +692,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)