[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57003] trunk/blender/source/blender/gpu/ shaders/gpu_shader_material.glsl: Fix for [#35490] Initial cube is green, turn off matcap and it is correct color

[Thomas Dinges]

Revision: 57003
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57003
Author:   dingto
Date:     2013-05-24 12:25:18 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Fix for [#35490] Initial cube is green, turn off matcap and it is correct color
* Own error from r56980, "smooth" is an Interpolation qualifier in GLSL, so use 
another variable name to avoid the error. 

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

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl

Modified: trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl
===================================================================
--- trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl   
2013-05-24 11:19:57 UTC (rev 57002)
+++ trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl   
2013-05-24 12:25:18 UTC (rev 57003)
@@ -2063,7 +2063,7 @@
        node_bsdf_diffuse(color, 0.0, N, result);
 }
 
-void node_bsdf_toon(vec4 color, float size, float smooth, vec3 N, out vec4 
result)
+void node_bsdf_toon(vec4 color, float size, float tsmooth, vec3 N, out vec4 
result)
 {
        node_bsdf_diffuse(color, 0.0, N, result);
 }

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