diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-11-12 01:18:46 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-11-12 01:18:46 +0300 |
| commit | c29795452cc71cb9f5a571a4aff0f593a2d7acaf (patch) | |
| tree | 53a46bb77f3102c545f7e55d3344e310b3bf6116 /intern/cycles/kernel/integrator/volume_shader.h | |
| parent | 9980fd0b8e1f3a07060316f28469f55a3f2fc0cd (diff) | |
| parent | 03ccf37162d365f3fdc8d8cd0cd6e9ff314fec6e (diff) | |
Merge branch 'master' into temp-sculpt-roll-mappingtemp-sculpt-roll-mapping
Diffstat (limited to 'intern/cycles/kernel/integrator/volume_shader.h')
| -rw-r--r-- | intern/cycles/kernel/integrator/volume_shader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/integrator/volume_shader.h b/intern/cycles/kernel/integrator/volume_shader.h index 0ff968723a1..f9050647c6d 100644 --- a/intern/cycles/kernel/integrator/volume_shader.h +++ b/intern/cycles/kernel/integrator/volume_shader.h @@ -493,8 +493,8 @@ ccl_device_inline void volume_shader_eval(KernelGlobals kg, /* evaluate shader */ # ifdef __OSL__ - if (kg->osl) { - OSLShader::eval_volume(kg, state, sd, path_flag); + if (kernel_data.kernel_features & KERNEL_FEATURE_OSL) { + osl_eval_nodes<SHADER_TYPE_VOLUME>(kg, state, sd, path_flag); } else # endif |