diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-13 20:37:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-13 20:37:09 +0300 |
| commit | 2d4a4fa0c1b617a8d68299c6d4501306867d51fa (patch) | |
| tree | a109ae3a33cbce162fee201289ea5faa29414759 /intern/cycles/render/shader.cpp | |
| parent | 18a9e0776c2e9400449a43f28707cc3e62b0c160 (diff) | |
| parent | 6eeac735f2425ce4dffaee747b7e8823a793e464 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render/shader.cpp')
| -rw-r--r-- | intern/cycles/render/shader.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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) |