diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-14 13:13:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-14 13:24:15 +0300 |
| commit | b50cf33d917b3e0fe7152cff96996e5a850c68d4 (patch) | |
| tree | 775a7e8a6129e634d8a4982671fa0999a76444e7 /intern/cycles/kernel/osl/osl_bssrdf.cpp | |
| parent | 9fecac32d9e9f3e6dd69f89fe4ceaddcecaf1277 (diff) | |
Fix T64515, T60434: crash in OSL and preview render after recent changes
The refactoring of texture handles did not take into account that render
services are shared between multiple render session. Now the texture
to handle map is also shared between render sessions.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_bssrdf.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_bssrdf.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp b/intern/cycles/kernel/osl/osl_bssrdf.cpp index b487aef09a1..dd52c33071c 100644 --- a/intern/cycles/kernel/osl/osl_bssrdf.cpp +++ b/intern/cycles/kernel/osl/osl_bssrdf.cpp @@ -67,7 +67,7 @@ class CBSSRDFClosure : public CClosurePrimitive { params.roughness = 0.0f; } - void setup(const KernelGlobals *, ShaderData *sd, int path_flag, float3 weight) + void setup(ShaderData *sd, int path_flag, float3 weight) { if (method == u_cubic) { alloc(sd, path_flag, weight, CLOSURE_BSSRDF_CUBIC_ID); |