[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57792] trunk/blender/intern/cycles/kernel : Cycles / Brick texture:

[Thomas Dinges]

Revision: 57792
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57792
Author:   dingto
Date:     2013-06-26 23:08:18 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Cycles / Brick texture:
* Avoid some unneeded int castings, they were only needed in the original Texture Nodes implementation as custom1 and custom2 were shorts. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/node_brick_texture.osl
    trunk/blender/intern/cycles/kernel/svm/svm_brick.h

Modified: trunk/blender/intern/cycles/kernel/shaders/node_brick_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_brick_texture.osl	2013-06-26 22:29:31 UTC (rev 57791)
+++ trunk/blender/intern/cycles/kernel/shaders/node_brick_texture.osl	2013-06-26 23:08:18 UTC (rev 57792)
@@ -41,8 +41,8 @@
 	rownum = (int)floor(p[1] / row_height);
 	
 	if (offset_frequency && squash_frequency) {
-		brick_width *= ((int)(rownum) % squash_frequency) ? 1.0 : squash_amount;                /* squash */
-		offset       = ((int)(rownum) % offset_frequency) ? 0 : (brick_width * offset_amount);  /* offset */
+		brick_width *= (rownum % squash_frequency) ? 1.0 : squash_amount;                /* squash */
+		offset       = (rownum % offset_frequency) ? 0.0 : (brick_width * offset_amount);  /* offset */
 	}
 
 	bricknum = (int)floor((p[0] + offset) / brick_width);

Modified: trunk/blender/intern/cycles/kernel/svm/svm_brick.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_brick.h	2013-06-26 22:29:31 UTC (rev 57791)
+++ trunk/blender/intern/cycles/kernel/svm/svm_brick.h	2013-06-26 23:08:18 UTC (rev 57792)
@@ -41,8 +41,8 @@
 	rownum = floor_to_int(p.y / row_height);
 	
 	if(offset_frequency && squash_frequency) {
-		brick_width *= ((int)(rownum) % squash_frequency ) ? 1.0f : squash_amount; /* squash */
-		offset = ((int)(rownum) % offset_frequency ) ? 0 : (brick_width*offset_amount); /* offset */
+		brick_width *= (rownum % squash_frequency) ? 1.0f : squash_amount; /* squash */
+		offset = (rownum % offset_frequency) ? 0.0f : (brick_width*offset_amount); /* offset */
 	}
 
 	bricknum = floor_to_int((p.x+offset) / brick_width);