[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59988] branches/soc-2013-dingto/intern/ cycles/kernel/closure/volume.h: Removed invalid code from volume closure, the OSL distinction has to happen on a different level and doesn' t make any sense.

[Lukas Toenne]

Revision: 59988
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59988
Author:   lukastoenne
Date:     2013-09-10 07:42:41 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Removed invalid code from volume closure, the OSL distinction has to happen on a different level and doesn't make any sense. The function body works in both SVM and OSL case.

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/cycles/kernel/closure/volume.h

Modified: branches/soc-2013-dingto/intern/cycles/kernel/closure/volume.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/closure/volume.h	2013-09-10 07:42:40 UTC (rev 59987)
+++ branches/soc-2013-dingto/intern/cycles/kernel/closure/volume.h	2013-09-10 07:42:41 UTC (rev 59988)
@@ -141,11 +141,6 @@
 
 __device float3 volume_eval_phase(KernelGlobals *kg, const ShaderClosure *sc, const float3 I, float3 omega_in, float *pdf)
 {
-#ifdef __OSL__
-	if(kg->osl && sc->prim)
-		return OSLShader::volume_eval_phase(sc, I, omega_in, *pdf);
-#endif
-
 	float3 eval;
 
 	switch(sc->type) {
@@ -168,11 +163,6 @@
 {
 	int label;
 
-#ifdef __OSL__
-	if(kg->osl && sc->prim)
-		return OSLShader::bsdf_sample(sd, sc, randu, randv, *eval, *omega_in, *domega_in, *pdf);
-#endif
-
 	switch(sc->type) {
 		case CLOSURE_VOLUME_ISOTROPIC_ID:
 			label = volume_isotropic_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv, eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);