diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-13 20:26:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-13 20:31:12 +0300 |
| commit | 1be16466e7983edbe8794127141267a8099d54be (patch) | |
| tree | f5178ac6ff840d8a2748e620c9a583613e44f0fe /intern/cycles/render/osl.h | |
| parent | 6a8d87db1879cc1bf96217987b52a4be2c80864c (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/osl.h')
| -rw-r--r-- | intern/cycles/render/osl.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |