[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50400] trunk/blender/intern/cycles/kernel /osl/nodes/node_brick_texture.osl: * Ups, variable mismatch in last commit.

[Thomas Dinges]

Revision: 50400
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50400
Author:   dingto
Date:     2012-09-04 22:39:30 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
* Ups, variable mismatch in last commit. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/nodes/node_brick_texture.osl

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_brick_texture.osl	2012-09-04 22:33:11 UTC (rev 50399)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_brick_texture.osl	2012-09-04 22:39:30 UTC (rev 50400)
@@ -83,12 +83,12 @@
 	if(Fac != 1.0) {
 		float facm = 1.0 - tint;
 
-		Col[0] = facm * (Color1[0]) + tint * Col[0];
-		Col[1] = facm * (Color1[1]) + tint * Col[1];
-		Col[2] = facm * (Color1[2]) + tint * Col[2];
+		Col[0] = facm * (Color1[0]) + tint * Color2[0];
+		Col[1] = facm * (Color1[1]) + tint * Color2[1];
+		Col[2] = facm * (Color1[2]) + tint * Color2[2];
 	}
 	
-	Color = (Fac == 1.0) ? Mortar: Color1;
+	Color = (Fac == 1.0) ? Mortar: Col;
 
 }