Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / OSL:

Browse Source 
* Compile fixes, missing ShaderClosure argument for eval functions. (r40163)
This commit is contained in:
Thomas Dinges
2012-06-04 19:53:50 +00:00
parent 6f0ad4ff0f
commit 510f98576a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/kernel_shader.h
View File

@@ -520,7 +520,7 @@ __device float3 shader_emissive_eval(KernelGlobals *kg, ShaderData *sd)
if(CLOSURE_IS_EMISSION(sc->type)) { if(CLOSURE_IS_EMISSION(sc->type)) {
#ifdef __OSL__ #ifdef __OSL__
eval += OSLShader::emissive_eval(sd)*sc->weight; eval += OSLShader::emissive_eval(sd, sc)*sc->weight;
#else #else
eval += svm_emissive_eval(sd, sc)*sc->weight; eval += svm_emissive_eval(sd, sc)*sc->weight;
#endif #endif
@@ -624,7 +624,7 @@ __device float3 shader_volume_eval_phase(KernelGlobals *kg, ShaderData *sd,
if(CLOSURE_IS_VOLUME(sc->type)) { if(CLOSURE_IS_VOLUME(sc->type)) {
#ifdef __OSL__ #ifdef __OSL__
eval += OSLShader::volume_eval_phase(sd, omega_in, omega_out); eval += OSLShader::volume_eval_phase(sd, sc, omega_in, omega_out);
#else #else
eval += volume_eval_phase(sd, sc, omega_in, omega_out); eval += volume_eval_phase(sd, sc, omega_in, omega_out);
#endif #endif