From 1be16466e7983edbe8794127141267a8099d54be Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 13 Mar 2019 18:26:11 +0100 Subject: 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. --- intern/cycles/render/osl.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'intern/cycles/render/osl.cpp') 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 -- cgit v1.2.3