diff options
| author | Thomas Dinges <blender@dingto.org> | 2015-02-18 18:33:31 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2015-02-18 18:33:31 +0300 |
| commit | 6f3500db0520b0c3fc70c2222b175e4e4eb65100 (patch) | |
| tree | ea7e620c8d4b84181fdfe9af4745d66287818cab | |
| parent | a2366a3a2e251ac0ddc86284f9d2e9b90b59777e (diff) | |
Cleanup: Remove unused SD_PHASE_HAS_EVAL flag.
We only have a non-singular volume closure and therefore no need to distinguish it.
| -rw-r--r-- | intern/cycles/kernel/closure/volume.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/kernel/closure/volume.h b/intern/cycles/kernel/closure/volume.h index 1cf5e17b8f7..439610546e5 100644 --- a/intern/cycles/kernel/closure/volume.h +++ b/intern/cycles/kernel/closure/volume.h @@ -36,7 +36,7 @@ ccl_device int volume_henyey_greenstein_setup(ShaderClosure *sc) /* clamp anisotropy to avoid delta function */ sc->data0 = signf(sc->data0) * min(fabsf(sc->data0), 1.0f - 1e-3f); - return SD_SCATTER|SD_PHASE_HAS_EVAL; + return SD_SCATTER; } ccl_device float3 volume_henyey_greenstein_eval_phase(const ShaderClosure *sc, const float3 I, float3 omega_in, float *pdf) diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 680094dcd0e..238b4b0bfdc 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -595,7 +595,6 @@ enum ShaderDataFlag { SD_EMISSION = (1 << 1), /* have emissive closure? */ SD_BSDF = (1 << 2), /* have bsdf closure? */ SD_BSDF_HAS_EVAL = (1 << 3), /* have non-singular bsdf closure? */ - SD_PHASE_HAS_EVAL = (1 << 3), /* have non-singular phase closure? */ SD_BSSRDF = (1 << 4), /* have bssrdf */ SD_HOLDOUT = (1 << 5), /* have holdout closure? */ SD_ABSORPTION = (1 << 6), /* have volume absorption closure? */ |