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/kernel_types.h | |
| 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/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 4070d5a8992..18d2a216f72 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -981,6 +981,7 @@ typedef ccl_addr_space struct ShaderData { differential3 ray_dP; #ifdef __OSL__ + struct KernelGlobals *osl_globals; struct PathState *osl_path_state; #endif |