[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56832] trunk/blender/intern/cycles/kernel /closure: Code cleanup / Cycles:

[Thomas Dinges]

Revision: 56832
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56832
Author:   dingto
Date:     2013-05-15 20:38:17 +0000 (Wed, 15 May 2013)
Log Message:
-----------
Code cleanup / Cycles:
* Some simplification of closure code (Velvet and Toon). 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
    trunk/blender/intern/cycles/kernel/closure/bsdf_toon.h

Modified: trunk/blender/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
===================================================================
--- trunk/blender/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h	2013-05-15 20:34:40 UTC (rev 56831)
+++ trunk/blender/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h	2013-05-15 20:38:17 UTC (rev 56832)
@@ -37,13 +37,10 @@
 
 __device int bsdf_ashikhmin_velvet_setup(ShaderClosure *sc)
 {
-	float sigma = sc->data0;
-	sigma = fmaxf(sigma, 0.01f);
-
-	float m_invsigma2 = 1.0f/(sigma * sigma);
-
+	float sigma = fmaxf(sc->data0, 0.01f);
+	sc->data0 = 1.0f/(sigma * sigma); /* m_invsigma2 */
+	
 	sc->type = CLOSURE_BSDF_ASHIKHMIN_VELVET_ID;
-	sc->data0 = m_invsigma2;
 
 	return SD_BSDF|SD_BSDF_HAS_EVAL;
 }

Modified: trunk/blender/intern/cycles/kernel/closure/bsdf_toon.h
===================================================================
--- trunk/blender/intern/cycles/kernel/closure/bsdf_toon.h	2013-05-15 20:34:40 UTC (rev 56831)
+++ trunk/blender/intern/cycles/kernel/closure/bsdf_toon.h	2013-05-15 20:38:17 UTC (rev 56832)
@@ -52,14 +52,12 @@
 
 __device float3 bsdf_toon_get_intensity(float max_angle, float smooth, float angle)
 {
-	float is;
+	float is = 0.0f;
 
 	if(angle < max_angle)
 		is = 1.0f;
 	else if(angle < (max_angle + smooth) && smooth != 0.0f)
 		is = (1.0f - (angle - max_angle)/smooth);
-	else
-		is = 0.0f;
 	
 	return make_float3(is, is, is);
 }