diff options
| author | Thomas Dinges <blender@dingto.org> | 2015-02-18 17:57:39 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2015-02-18 17:57:39 +0300 |
| commit | a2366a3a2e251ac0ddc86284f9d2e9b90b59777e (patch) | |
| tree | 7a3f31eecade33ea1ba4f0e0f3d4c791966af51c /intern/cycles/kernel/osl | |
| parent | bf0a001e615c85cb998b68888f75e0e51188e650 (diff) | |
Cleanup for Cycles hair shader ifdefs.
sc->T and sc->data2 were behind __HAIR__ ifdef, now they are not anymore, so we can always assign the correct value.
Diffstat (limited to 'intern/cycles/kernel/osl')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_closures.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index 1d99f1d2682..461ce8f7598 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -153,26 +153,16 @@ BSDF_CLOSURE_CLASS_BEGIN(HairReflection, hair_reflection, hair_reflection, LABEL CLOSURE_FLOAT3_PARAM(HairReflectionClosure, sc.N), CLOSURE_FLOAT_PARAM(HairReflectionClosure, sc.data0), CLOSURE_FLOAT_PARAM(HairReflectionClosure, sc.data1), -#ifdef __HAIR__ CLOSURE_FLOAT3_PARAM(HairReflectionClosure, sc.T), CLOSURE_FLOAT_PARAM(HairReflectionClosure, sc.data2), -#else - CLOSURE_FLOAT3_PARAM(HairReflectionClosure, sc.N), - CLOSURE_FLOAT_PARAM(HairReflectionClosure, sc.data1), -#endif BSDF_CLOSURE_CLASS_END(HairReflection, hair_reflection) BSDF_CLOSURE_CLASS_BEGIN(HairTransmission, hair_transmission, hair_transmission, LABEL_GLOSSY) CLOSURE_FLOAT3_PARAM(HairTransmissionClosure, sc.N), CLOSURE_FLOAT_PARAM(HairTransmissionClosure, sc.data0), CLOSURE_FLOAT_PARAM(HairTransmissionClosure, sc.data1), -#ifdef __HAIR__ CLOSURE_FLOAT3_PARAM(HairReflectionClosure, sc.T), CLOSURE_FLOAT_PARAM(HairReflectionClosure, sc.data2), -#else - CLOSURE_FLOAT3_PARAM(HairReflectionClosure, sc.N), - CLOSURE_FLOAT_PARAM(HairReflectionClosure, sc.data1), -#endif BSDF_CLOSURE_CLASS_END(HairTransmission, hair_transmission) VOLUME_CLOSURE_CLASS_BEGIN(VolumeHenyeyGreenstein, henyey_greenstein, LABEL_VOLUME_SCATTER) |