[Bf-blender-cvs] [6f3500d] master: Cleanup: Remove unused SD_PHASE_HAS_EVAL flag.

[Thomas Dinges]

Commit: 6f3500db0520b0c3fc70c2222b175e4e4eb65100
Author: Thomas Dinges
Date:   Wed Feb 18 16:33:31 2015 +0100
Branches: master
https://developer.blender.org/rB6f3500db0520b0c3fc70c2222b175e4e4eb65100

Cleanup: Remove unused SD_PHASE_HAS_EVAL flag.

We only have a non-singular volume closure and therefore no need to distinguish it.

===================================================================

M	intern/cycles/kernel/closure/volume.h
M	intern/cycles/kernel/kernel_types.h

===================================================================

diff --git a/intern/cycles/kernel/closure/volume.h b/intern/cycles/kernel/closure/volume.h
index 1cf5e17..4396105 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 680094d..238b4b0 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? */