diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-13 03:03:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-13 03:03:12 +0400 |
| commit | 9ebfcea8f392a0ac91247973d2e9ee06f689799c (patch) | |
| tree | 48ee1910bbe7156e262fd2329dc8346c1e314bfa /intern/cycles/kernel/osl/osl_shader.cpp | |
| parent | 310b25c388aeaf43eeb4b0e4895cc5a24e44cd8e (diff) | |
Cycles: revert commit that joined surface/volume socket into a single shader socket,
on second thought this makes it a bit too difficult to understand what's going on.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_shader.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index 42e63552063..18a8e974492 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -218,8 +218,8 @@ void OSLShader::eval_surface(KernelGlobals *kg, ShaderData *sd, float randb, int /* execute shader for this point */ int shader = sd->shader & SHADER_MASK; - if(kg->osl.state[shader]) - ctx->execute(OSL::pvt::ShadUseSurface, *(kg->osl.state[shader]), *globals); + if(kg->osl.surface_state[shader]) + ctx->execute(OSL::pvt::ShadUseSurface, *(kg->osl.surface_state[shader]), *globals); /* flatten closure tree */ sd->num_closure = 0; @@ -355,8 +355,8 @@ void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, float randb, int /* execute shader */ int shader = sd->shader & SHADER_MASK; - if(kg->osl.state[shader]) - ctx->execute(OSL::pvt::ShadUseSurface, *(kg->osl.state[shader]), *globals); + if(kg->osl.volume_state[shader]) + ctx->execute(OSL::pvt::ShadUseSurface, *(kg->osl.volume_state[shader]), *globals); /* retrieve resulting closures */ sd->osl_closure.volume_sample_sum = 0.0f; |