[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50596] branches/soc-2011-tomato/intern/ cycles/kernel/svm/svm_brick.h: Synchronize changes with trunk

[Sergey Sharybin]

Revision: 50596
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50596
Author:   nazgul
Date:     2012-09-14 14:49:40 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Synchronize changes with trunk

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_brick.h

Modified: branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_brick.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_brick.h	2012-09-14 14:37:19 UTC (rev 50595)
+++ branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_brick.h	2012-09-14 14:49:40 UTC (rev 50596)
@@ -70,7 +70,7 @@
 	/* RNA properties */
 	uint offset_frequency, squash_frequency;
 	
-	float tint = 0;
+	float tint = 0.0f;
 
 	decode_node_uchar4(node.y, &co_offset, &color1_offset, &color2_offset, &mortar_offset);
 	decode_node_uchar4(node.z, &scale_offset, &mortar_size_offset, &bias_offset, &brick_width_offset);