[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59248] trunk/blender/intern/cycles/kernel /shaders/node_subsurface_scattering.osl: Cycles / SSS:

[Thomas Dinges]

Revision: 59248
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59248
Author:   dingto
Date:     2013-08-18 20:49:58 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
Cycles / SSS:
* OSL rendered Black with Compatible Fallof option, fixed. 

Note: OSL uses compatible scattering when "Compatible" or "Bicubic" is selected. I guess compatible will be removed later? If not we need to fix this properly. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/node_subsurface_scattering.osl

Modified: trunk/blender/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_subsurface_scattering.osl	2013-08-18 20:17:18 UTC (rev 59247)
+++ trunk/blender/intern/cycles/kernel/shaders/node_subsurface_scattering.osl	2013-08-18 20:49:58 UTC (rev 59248)
@@ -25,9 +25,9 @@
 	normal Normal = N,
 	output closure color BSSRDF = 0)
 {
-	if(Falloff == "Cubic")
+	if(Falloff == "Gaussian")
+		BSSRDF = Color * bssrdf_gaussian(N, Scale * Radius);
+	else /* Cubic, hardcoded to compatible closure for now */
 		BSSRDF = Color * bssrdf_cubic(N, Scale * Radius);
-	else if(Falloff == "Gaussian")
-		BSSRDF = Color * bssrdf_gaussian(N, Scale * Radius);
 }