[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50285] branches/soc-2011-tomato/source/ blender/gpu/shaders/gpu_shader_material.glsl: Cycles / Brick Texture:

[Thomas Dinges]

Revision: 50285
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50285
Author:   dingto
Date:     2012-08-30 20:45:01 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
Cycles / Brick Texture:
* Added GLSL stub for the Brick texture, fixes an error in the console when 
switching to Material Shading in the 3D View.  

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl

Modified: 
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl
===================================================================
--- 
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl    
    2012-08-30 17:55:21 UTC (rev 50284)
+++ 
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl    
    2012-08-30 20:45:01 UTC (rev 50285)
@@ -2114,6 +2114,12 @@
        fac = 1.0;
 }
 
+void node_tex_brick(vec3 co, vec4 color1, vec4 color2, vec4 mortar, float 
scale, float mortar_size, float bias, float brick_width, float row_height, out 
vec4 color, out float fac)
+{
+       color = vec4(1.0);
+       fac = 1.0;
+}
+
 void node_tex_clouds(vec3 co, float size, out vec4 color, out float fac)
 {
        color = vec4(1.0);

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