[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50322] trunk/blender/intern/cycles/kernel /osl/nodes/node_texture.h: * OSL can't overwrite input parameters, use a local variable instead.

Thomas Dinges blender at dingto.org
Sun Sep 2 18:37:58 CEST 2012


Revision: 50322
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50322
Author:   dingto
Date:     2012-09-02 16:37:58 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
* OSL can't overwrite input parameters, use a local variable instead.

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:19:02 UTC (rev 50321)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h	2012-09-02 16:37:58 UTC (rev 50322)
@@ -212,14 +212,14 @@
 
 /* Turbulence */
 
-float noise_turbulence(point p, string basis, float octaves, int hard)
+float noise_turbulence(point p, string basis, float details, int hard)
 {
 	float fscale = 1.0;
 	float amp = 1.0;
 	float sum = 0.0;
 	int i, n;
 	
-	octaves = clamp(octaves, 0.0, 16.0);
+	float octaves = clamp(details, 0.0, 16.0);
 	n = (int)octaves;
 
 	for (i = 0; i <= n; i++) {




More information about the Bf-blender-cvs mailing list