[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50312] trunk/blender/intern/cycles/kernel /osl/nodes: Cycles / OSL:
Thomas Dinges
blender at dingto.org
Sun Sep 2 14:24:05 CEST 2012
Revision: 50312
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50312
Author: dingto
Date: 2012-09-02 12:24:04 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
Cycles / OSL:
* First batch of compile fixes for several shaders, mainly syntax errors.
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/osl/nodes/node_math.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_mix.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_normal.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_math.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_math.osl 2012-09-02 01:10:31 UTC (rev 50311)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_math.osl 2012-09-02 12:24:04 UTC (rev 50312)
@@ -40,7 +40,7 @@
shader node_math(
string type = "Add",
- int Clamp = false,
+ int Clamp = 0,
float Value1 = 0.0,
float Value2 = 0.0,
output float Value = 0.0)
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_mix.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_mix.osl 2012-09-02 01:10:31 UTC (rev 50311)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_mix.osl 2012-09-02 12:24:04 UTC (rev 50312)
@@ -280,7 +280,7 @@
shader node_mix(
string type = "Mix",
- int Clamp = false,
+ int Clamp = 0,
float Fac = 0.5,
color Color1 = color(0.0, 0.0, 0.0),
color Color2 = color(0.0, 0.0, 0.0),
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl 2012-09-02 01:10:31 UTC (rev 50311)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl 2012-09-02 12:24:04 UTC (rev 50312)
@@ -27,7 +27,7 @@
int hard = 0;
float fac = 0.0;
- if(distortion != 0.0( {
+ if(distortion != 0.0) {
r[0] = noise_basis(p + point(13.5), basis) * distortion;
r[1] = noise_basis(p, basis) * distortion;
r[2] = noise_basis(p - point(13.5), basis) * distortion;
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_normal.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_normal.osl 2012-09-02 01:10:31 UTC (rev 50311)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_normal.osl 2012-09-02 12:24:04 UTC (rev 50312)
@@ -22,7 +22,7 @@
normal Direction = normal(0.0, 0.0, 0.0),
normal NormalIn = normal(0.0, 0.0, 0.0),
output normal NormalOut = normal(0.0, 0.0, 0.0),
- output float Dot = 1.0
+ output float Dot = 1.0)
{
Direction = normalize(Direction);
NormalOut = Direction;
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl 2012-09-02 01:10:31 UTC (rev 50311)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl 2012-09-02 12:24:04 UTC (rev 50312)
@@ -31,14 +31,14 @@
float n = 0.0;
if(type == "Bands") {
- n = (x + y + z)*10.0);
+ n = (x + y + z)*10.0;
}
else if(type == "Rings") {
n = (sqrt(x*x + y*y + z*z)*20.0);
}
if(distortion != 0.0) {
- n = n +(distortion * noise_turbulence(p*dscale, "Perlin", detail, 0);
+ n = n +(distortion * noise_turbulence(p*dscale, "Perlin", detail, 0));
}
result = noise_wave("Sine", n);
More information about the Bf-blender-cvs
mailing list