[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50321] trunk/blender/intern/cycles/kernel /osl/nodes/node_texture.h: * Fixes for last commit

[Thomas Dinges]

Revision: 50321
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50321
Author:   dingto
Date:     2012-09-02 16:19:02 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
* Fixes for last commit

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

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h	2012-09-02 16:06:18 UTC (rev 50320)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h	2012-09-02 16:19:02 UTC (rev 50321)
@@ -212,14 +212,14 @@
 
 /* Turbulence */
 
-float noise_turbulence(point p, string basis, int octaves, int hard)
+float noise_turbulence(point p, string basis, float octaves, int hard)
 {
 	float fscale = 1.0;
 	float amp = 1.0;
 	float sum = 0.0;
 	int i, n;
 	
-	octaves = clamp(octaves, 0.0f, 16.0f);
+	octaves = clamp(octaves, 0.0, 16.0);
 	n = (int)octaves;
 
 	for (i = 0; i <= n; i++) {
@@ -233,20 +233,20 @@
 		fscale *= 2.0;
 	}
 	
-	float rmd = octaves - floor(octaves)
+	float rmd = octaves - floor(octaves);
 
-	if(rmd != 0.0f) {
+	if(rmd != 0.0) {
 		float t = noise_basis(fscale*p, basis);
 
 		if(hard)
-			t = fabsf(2.0f*t - 1.0f);
+			t = fabs(2.0*t - 1.0);
 
 		float sum2 = sum + t*amp;
 
 		sum *= ((float)(1 << n)/(float)((1 << (n+1)) - 1));
 		sum2 *= ((float)(1 << (n+1))/(float)((1 << (n+2)) - 1));
 
-		return (1.0f - rmd)*sum + rmd*sum2;
+		return (1.0 - rmd)*sum + rmd*sum2;
 	}
 	else {
 		sum *= ((float)(1 << n)/(float)((1 << (n+1)) - 1));