diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-06-04 23:53:50 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-06-04 23:53:50 +0400 |
| commit | 510f98576a1b392226330dd854e049f712ddf62c (patch) | |
| tree | 27c54c5c8d8a9f0dba897f3cc3784ff8bfc5d677 /intern | |
| parent | 6f0ad4ff0f53e4e2499d3e92c5cbad7582d36b9a (diff) | |
Cycles / OSL:
* Compile fixes, missing ShaderClosure argument for eval functions. (r40163)
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 8e0d36705ad..53a41d58e20 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -520,7 +520,7 @@ __device float3 shader_emissive_eval(KernelGlobals *kg, ShaderData *sd) if(CLOSURE_IS_EMISSION(sc->type)) { #ifdef __OSL__ - eval += OSLShader::emissive_eval(sd)*sc->weight; + eval += OSLShader::emissive_eval(sd, sc)*sc->weight; #else eval += svm_emissive_eval(sd, sc)*sc->weight; #endif @@ -624,7 +624,7 @@ __device float3 shader_volume_eval_phase(KernelGlobals *kg, ShaderData *sd, if(CLOSURE_IS_VOLUME(sc->type)) { #ifdef __OSL__ - eval += OSLShader::volume_eval_phase(sd, omega_in, omega_out); + eval += OSLShader::volume_eval_phase(sd, sc, omega_in, omega_out); #else eval += volume_eval_phase(sd, sc, omega_in, omega_out); #endif |