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

[Thomas Dinges]

Revision: 56860
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56860
Author:   dingto
Date:     2013-05-16 15:47:09 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Cycles:
* Revert part of r56832, if code gets more complicated, it's better to keep it 
more logical here. 

Revision Links:
--------------
    
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56832

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

Modified: trunk/blender/intern/cycles/kernel/closure/bsdf_toon.h
===================================================================
--- trunk/blender/intern/cycles/kernel/closure/bsdf_toon.h      2013-05-16 
15:32:55 UTC (rev 56859)
+++ trunk/blender/intern/cycles/kernel/closure/bsdf_toon.h      2013-05-16 
15:47:09 UTC (rev 56860)
@@ -52,12 +52,14 @@
 
 __device float3 bsdf_toon_get_intensity(float max_angle, float smooth, float 
angle)
 {
-       float is = 0.0f;
+       float is;
 
        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);
 }

Modified: trunk/blender/intern/cycles/kernel/closure/bsdf_util.h
===================================================================
--- trunk/blender/intern/cycles/kernel/closure/bsdf_util.h      2013-05-16 
15:32:55 UTC (rev 56859)
+++ trunk/blender/intern/cycles/kernel/closure/bsdf_util.h      2013-05-16 
15:47:09 UTC (rev 56860)
@@ -30,8 +30,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OSL_BSDF_H__
-#define __OSL_BSDF_H__
+#ifndef __BSDF_UTIL_H__
+#define __BSDF_UTIL_H__
 
 CCL_NAMESPACE_BEGIN
 
@@ -133,5 +133,5 @@
 
 CCL_NAMESPACE_END
 
-#endif /* __OSL_BSDF_H__ */
+#endif /* __BSDF_UTIL_H__ */
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs