diff options
author | Thomas Dinges <blender@dingto.org> | 2012-12-11 20:06:03 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-12-11 20:06:03 +0400 |
commit | 188718a3d57f3d869f228142ae30cce904e0e2e8 (patch) | |
tree | 8139c3d28378a5dd44aa5b0e187abeeb99d49516 | |
parent | 92ae023a90adcac43a8079978eded9e0ca26a1ae (diff) |
OSL Shader Files:
* Simplify default color values, where each component was the same.
* Initialize closures as Null Closure, rather than assigning an existing closure, gets overwritten anyways.
42 files changed, 70 insertions, 70 deletions
diff --git a/intern/cycles/kernel/shaders/node_add_closure.osl b/intern/cycles/kernel/shaders/node_add_closure.osl index ecf6bf5912e..5c9ffecd1f1 100644 --- a/intern/cycles/kernel/shaders/node_add_closure.osl +++ b/intern/cycles/kernel/shaders/node_add_closure.osl @@ -19,9 +19,9 @@ #include "stdosl.h" shader node_add_closure( - closure color Closure1 = background(), - closure color Closure2 = background(), - output closure color Closure = background()) + closure color Closure1 = 0, + closure color Closure2 = 0, + output closure color Closure = 0) { Closure = Closure1 + Closure2; } diff --git a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl index b9423344e73..58c44224e8d 100644 --- a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl +++ b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl @@ -20,8 +20,8 @@ shader node_ambient_occlusion( normal NormalIn = N, - color Color = color(0.8, 0.8, 0.8), - output closure color AO = ambient_occlusion()) + color Color = 0.8, + output closure color AO = 0) { AO = Color * ambient_occlusion(); } diff --git a/intern/cycles/kernel/shaders/node_attribute.osl b/intern/cycles/kernel/shaders/node_attribute.osl index 8e7c846d1a3..47404927779 100644 --- a/intern/cycles/kernel/shaders/node_attribute.osl +++ b/intern/cycles/kernel/shaders/node_attribute.osl @@ -22,7 +22,7 @@ shader node_attribute( string bump_offset = "center", string name = "", output point Vector = point(0.0, 0.0, 0.0), - output color Color = color(0.0, 0.0, 0.0), + output color Color = 0.0, output float Fac = 0.0) { getattribute(name, Color); diff --git a/intern/cycles/kernel/shaders/node_background.osl b/intern/cycles/kernel/shaders/node_background.osl index b51a1685294..b0c62c0381c 100644 --- a/intern/cycles/kernel/shaders/node_background.osl +++ b/intern/cycles/kernel/shaders/node_background.osl @@ -19,9 +19,9 @@ #include "stdosl.h" shader node_background( - color Color = color(0.8, 0.8, 0.8), + color Color = 0.8, float Strength = 1.0, - output closure color Background = background()) + output closure color Background = 0) { Background = Color * Strength * background(); } diff --git a/intern/cycles/kernel/shaders/node_brick_texture.osl b/intern/cycles/kernel/shaders/node_brick_texture.osl index b1f2a35789f..509b4f2883b 100644 --- a/intern/cycles/kernel/shaders/node_brick_texture.osl +++ b/intern/cycles/kernel/shaders/node_brick_texture.osl @@ -65,16 +65,16 @@ shader node_brick_texture( float Squash = 1.0, int SquashFrequency = 1, point Vector = P, - color Color1 = color(0.2, 0.2, 0.2), - color Color2 = color(0.8, 0.8, 0.8), - color Mortar = color(0.0, 0.0, 0.0), + color Color1 = 0.2, + color Color2 = 0.8, + color Mortar = 0.0, float Scale = 5.0, float MortarSize = 0.02, float Bias = 0.0, float BrickWidth = 0.5, float RowHeight = 0.25, output float Fac = 0.0, - output color Color = color(0.2, 0.2, 0.2)) + output color Color = 0.2) { point p = Vector; diff --git a/intern/cycles/kernel/shaders/node_brightness.osl b/intern/cycles/kernel/shaders/node_brightness.osl index b263d815566..2de3c94ecc1 100644 --- a/intern/cycles/kernel/shaders/node_brightness.osl +++ b/intern/cycles/kernel/shaders/node_brightness.osl @@ -19,10 +19,10 @@ #include "stdosl.h" shader node_brightness( - color ColorIn = color(0.8, 0.8, 0.8), + color ColorIn = 0.8, float Bright = 0.0, float Contrast = 0.0, - output color ColorOut = color(0.8, 0.8, 0.8)) + output color ColorOut = 0.8) { float a = 1.0 + Contrast; float b = Bright - Contrast*0.5; diff --git a/intern/cycles/kernel/shaders/node_checker_texture.osl b/intern/cycles/kernel/shaders/node_checker_texture.osl index eed56f4453a..84cfa8937a6 100644 --- a/intern/cycles/kernel/shaders/node_checker_texture.osl +++ b/intern/cycles/kernel/shaders/node_checker_texture.osl @@ -44,10 +44,10 @@ shader node_checker_texture( matrix mapping = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), float Scale = 5.0, point Vector = P, - color Color1 = color(0.8, 0.8, 0.8), - color Color2 = color(0.2, 0.2, 0.2), + color Color1 = 0.8, + color Color2 = 0.2, output float Fac = 0.0, - output color Color = color(0.0, 0.0, 0.0)) + output color Color = 0.0) { point p = Vector; diff --git a/intern/cycles/kernel/shaders/node_combine_rgb.osl b/intern/cycles/kernel/shaders/node_combine_rgb.osl index 546369f660e..1bdb4de9a5e 100644 --- a/intern/cycles/kernel/shaders/node_combine_rgb.osl +++ b/intern/cycles/kernel/shaders/node_combine_rgb.osl @@ -22,7 +22,7 @@ shader node_combine_rgb( float R = 0.0, float G = 0.0, float B = 0.0, - output color Image = color(0.8, 0.8, 0.8)) + output color Image = 0.8) { Image = color(R, G, B); } diff --git a/intern/cycles/kernel/shaders/node_convert_from_color.osl b/intern/cycles/kernel/shaders/node_convert_from_color.osl index ea488c9ce4c..6a6512e9f5b 100644 --- a/intern/cycles/kernel/shaders/node_convert_from_color.osl +++ b/intern/cycles/kernel/shaders/node_convert_from_color.osl @@ -19,7 +19,7 @@ #include "stdosl.h" shader node_convert_from_color( - color Color = color(0.0, 0.0, 0.0), + color Color = 0.0, output string String = "", output float Val = 0.0, output int ValInt = 0, diff --git a/intern/cycles/kernel/shaders/node_convert_from_float.osl b/intern/cycles/kernel/shaders/node_convert_from_float.osl index a20b491c91d..b6d5084a6dd 100644 --- a/intern/cycles/kernel/shaders/node_convert_from_float.osl +++ b/intern/cycles/kernel/shaders/node_convert_from_float.osl @@ -22,7 +22,7 @@ shader node_convert_from_float( float Val = 0.0, output string String = "", output int ValInt = 0, - output color Color = color(0.0, 0.0, 0.0), + output color Color = 0.0, output vector Vector = vector(0.0, 0.0, 0.0), output point Point = point(0.0, 0.0, 0.0), output normal Normal = normal(0.0, 0.0, 0.0)) diff --git a/intern/cycles/kernel/shaders/node_convert_from_int.osl b/intern/cycles/kernel/shaders/node_convert_from_int.osl index 911b4928db8..3d389cfa587 100644 --- a/intern/cycles/kernel/shaders/node_convert_from_int.osl +++ b/intern/cycles/kernel/shaders/node_convert_from_int.osl @@ -22,7 +22,7 @@ shader node_convert_from_int( int ValInt = 0, output string String = "", output float Val = 0.0, - output color Color = color(0.0, 0.0, 0.0), + output color Color = 0.0, output vector Vector = vector(0.0, 0.0, 0.0), output point Point = point(0.0, 0.0, 0.0), output normal Normal = normal(0.0, 0.0, 0.0)) diff --git a/intern/cycles/kernel/shaders/node_convert_from_normal.osl b/intern/cycles/kernel/shaders/node_convert_from_normal.osl index 1add7400a22..a4cb004f597 100644 --- a/intern/cycles/kernel/shaders/node_convert_from_normal.osl +++ b/intern/cycles/kernel/shaders/node_convert_from_normal.osl @@ -24,7 +24,7 @@ shader node_convert_from_normal( output float Val = 0.0, output int ValInt = 0, output vector Vector = vector(0.0, 0.0, 0.0), - output color Color = color(0.0, 0.0, 0.0), + output color Color = 0.0, output point Point = point(0.0, 0.0, 0.0)) { Val = (Normal[0] + Normal[1] + Normal[2]) * (1.0 / 3.0); diff --git a/intern/cycles/kernel/shaders/node_convert_from_point.osl b/intern/cycles/kernel/shaders/node_convert_from_point.osl index 8a315828c55..8ea7d380247 100644 --- a/intern/cycles/kernel/shaders/node_convert_from_point.osl +++ b/intern/cycles/kernel/shaders/node_convert_from_point.osl @@ -24,7 +24,7 @@ shader node_convert_from_point( output float Val = 0.0, output int ValInt = 0, output vector Vector = vector(0.0, 0.0, 0.0), - output color Color = color(0.0, 0.0, 0.0), + output color Color = 0.0, output normal Normal = normal(0.0, 0.0, 0.0)) { Val = (Point[0] + Point[1] + Point[2]) * (1.0 / 3.0); diff --git a/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl b/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl index d6dc17316e8..eae4772f173 100644 --- a/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl @@ -19,10 +19,10 @@ #include "stdosl.h" shader node_diffuse_bsdf( - color Color = color(0.8, 0.8, 0.8), + color Color = 0.8, float Roughness = 0.0, normal Normal = N, - output closure color BSDF = diffuse(Normal)) + output closure color BSDF = 0) { if (Roughness == 0.0) BSDF = Color * diffuse(Normal); diff --git a/intern/cycles/kernel/shaders/node_emission.osl b/intern/cycles/kernel/shaders/node_emission.osl index 7ad0f9f7760..854d94c0f9d 100644 --- a/intern/cycles/kernel/shaders/node_emission.osl +++ b/intern/cycles/kernel/shaders/node_emission.osl @@ -20,9 +20,9 @@ shader node_emission( int TotalPower = 0, - color Color = color(0.8, 0.8, 0.8), + color Color = 0.8, float Strength = 1.0, - output closure color Emission = emission()) + output closure color Emission = 0) { if (TotalPower) Emission = ((Strength / surfacearea()) * Color) * emission(); diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl index 7da336a53f0..33b30a27ee1 100644 --- a/intern/cycles/kernel/shaders/node_environment_texture.osl +++ b/intern/cycles/kernel/shaders/node_environment_texture.osl @@ -48,7 +48,7 @@ shader node_environment_texture( string filename = "", string projection = "Equirectangular", string color_space = "sRGB", - output color Color = color(0.0, 0.0, 0.0), + output color Color = 0.0, output float Alpha = 1.0) { vector p = Vector; diff --git a/intern/cycles/kernel/shaders/node_gamma.osl b/intern/cycles/kernel/shaders/node_gamma.osl index d55e908b0b7..5c913c29d5f 100644 --- a/intern/cycles/kernel/shaders/node_gamma.osl +++ b/intern/cycles/kernel/shaders/node_gamma.osl @@ -19,9 +19,9 @@ #include "stdosl.h" shader node_gamma( - color ColorIn = color(0.8, 0.8, 0.8), + color ColorIn = 0.8, float Gamma = 1.0, - output color ColorOut = color(0.0, 0.0, 0.0)) + output color ColorOut = 0.0) { ColorOut = pow(ColorIn, Gamma); } diff --git a/intern/cycles/kernel/shaders/node_glass_bsdf.osl b/intern/cycles/kernel/shaders/node_glass_bsdf.osl index 30b9d301f32..da1a42876fe 100644 --- a/intern/cycles/kernel/shaders/node_glass_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_glass_bsdf.osl @@ -20,12 +20,12 @@ #include "node_fresnel.h" shader node_glass_bsdf( - color Color = color(0.8, 0.8, 0.8), + color Color = 0.8, string distribution = "Sharp", float Roughness = 0.2, float IOR = 1.45, normal Normal = N, - output closure color BSDF = diffuse(Normal)) + output closure color BSDF = 0) { float f = max(IOR, 1.0 + 1e-5); float eta = backfacing() ? 1.0 / f: f; diff --git a/intern/cycles/kernel/shaders/node_glossy_bsdf.osl b/intern/cycles/kernel/shaders/node_glossy_bsdf.osl index 03340c74af5..79bbe724acd 100644 --- a/intern/cycles/kernel/shaders/node_glossy_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_glossy_bsdf.osl @@ -20,11 +20,11 @@ #include "node_fresnel.h" shader node_glossy_bsdf( - color Color = color(0.8, 0.8, 0.8), + color Color = 0.8, string distribution = "Beckmann", float Roughness = 0.2, normal Normal = N, - output closure color BSDF = diffuse(Normal)) + output closure color BSDF = 0) { if (distribution == "Sharp") BSDF = Color * reflection(Normal); diff --git a/intern/cycles/kernel/shaders/node_gradient_texture.osl b/intern/cycles/kernel/shaders/node_gradient_texture.osl index 8d862dbad67..9ae281ff623 100644 --- a/intern/cycles/kernel/shaders/node_gradient_texture.osl +++ b/intern/cycles/kernel/shaders/node_gradient_texture.osl @@ -68,7 +68,7 @@ shader node_gradient_texture( string Type = "Linear", point Vector = P, output float Fac = 0.0, - output color Color = color(0.0, 0.0, 0.0)) + output color Color = 0.0) { point p = Vector; diff --git a/intern/cycles/kernel/shaders/node_hsv.osl b/intern/cycles/kernel/shaders/node_hsv.osl index 0f4bedfb0f8..d5fdb1c616f 100644 --- a/intern/cycles/kernel/shaders/node_hsv.osl +++ b/intern/cycles/kernel/shaders/node_hsv.osl @@ -24,8 +24,8 @@ shader node_hsv( float Saturation = 1.0, float Value = 1.0, float Fac = 0.5, - color ColorIn = color(0.0, 0.0, 0.0), - output color ColorOut = color(0.0, 0.0, 0.0)) + color ColorIn = 0.0, + output color ColorOut = 0.0) { color Color = rgb_to_hsv(ColorIn); diff --git a/intern/cycles/kernel/shaders/node_image_texture.osl b/intern/cycles/kernel/shaders/node_image_texture.osl index 99074672a6a..c94a3f7e76a 100644 --- a/intern/cycles/kernel/shaders/node_image_texture.osl +++ b/intern/cycles/kernel/shaders/node_image_texture.osl @@ -37,7 +37,7 @@ shader node_image_texture( string color_space = "sRGB", string projection = "Flat", float projection_blend = 0.0, - output color Color = color(0.0, 0.0, 0.0), + output color Color = 0.0, output float Alpha = 1.0) { point p = Vector; diff --git a/intern/cycles/kernel/shaders/node_invert.osl b/intern/cycles/kernel/shaders/node_invert.osl index 27021942558..8711e2f120f 100644 --- a/intern/cycles/kernel/shaders/node_invert.osl +++ b/intern/cycles/kernel/shaders/node_invert.osl @@ -20,8 +20,8 @@ shader node_invert( float Fac = 1.0, - color ColorIn = color(0.8, 0.8, 0.8), - output color ColorOut = color(0.8, 0.8, 0.8)) + color ColorIn = 0.8, + output color ColorOut = 0.8) { color ColorInv = color(1.0) - ColorIn; ColorOut = mix(ColorIn, ColorInv, Fac); diff --git a/intern/cycles/kernel/shaders/node_magic_texture.osl b/intern/cycles/kernel/shaders/node_magic_texture.osl index b81a30499b2..943d9c6af68 100644 --- a/intern/cycles/kernel/shaders/node_magic_texture.osl +++ b/intern/cycles/kernel/shaders/node_magic_texture.osl @@ -99,7 +99,7 @@ shader node_magic_texture( float Distortion = 5.0, float Scale = 5.0, point Vector = P, - output color Color = color(0.0, 0.0, 0.0)) + output color Color = 0.0) { point p = Vector; diff --git a/intern/cycles/kernel/shaders/node_mix.osl b/intern/cycles/kernel/shaders/node_mix.osl index b2af36230f8..bcd00bb84e8 100644 --- a/intern/cycles/kernel/shaders/node_mix.osl +++ b/intern/cycles/kernel/shaders/node_mix.osl @@ -282,9 +282,9 @@ shader node_mix( string type = "Mix", 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), - output color Color = color(0.0, 0.0, 0.0)) + color Color1 = 0.0, + color Color2 = 0.0, + output color Color = 0.0) { float t = clamp(Fac, 0.0, 1.0); diff --git a/intern/cycles/kernel/shaders/node_mix_closure.osl b/intern/cycles/kernel/shaders/node_mix_closure.osl index e28dd1fc436..a0bef49b879 100644 --- a/intern/cycles/kernel/shaders/node_mix_closure.osl +++ b/intern/cycles/kernel/shaders/node_mix_closure.osl @@ -20,9 +20,9 @@ shader node_mix_closure( float Fac = 0.5, - closure color Closure1 = background(), - closure color Closure2 = background(), - output closure color Closure = background()) + closure color Closure1 = 0, + closure color Closure2 = 0, + output closure color Closure = 0) { float t = clamp(Fac, 0.0, 1.0); Closure = (1.0 - t) * Closure1 + t * Closure2; diff --git a/intern/cycles/kernel/shaders/node_musgrave_texture.osl b/intern/cycles/kernel/shaders/node_musgrave_texture.osl index afdbca27a3f..541f26b4e56 100644 --- a/intern/cycles/kernel/shaders/node_musgrave_texture.osl +++ b/intern/cycles/kernel/shaders/node_musgrave_texture.osl @@ -198,7 +198,7 @@ shader node_musgrave_texture( float Scale = 5.0, point Vector = P, output float Fac = 0.0, - output color Color = color(0.0, 0.0, 0.0)) + output color Color = 0.0) { float dimension = max(Dimension, 1e-5); float octaves = clamp(Detail, 0.0, 16.0); diff --git a/intern/cycles/kernel/shaders/node_noise_texture.osl b/intern/cycles/kernel/shaders/node_noise_texture.osl index 0a379491781..ec86a10b013 100644 --- a/intern/cycles/kernel/shaders/node_noise_texture.osl +++ b/intern/cycles/kernel/shaders/node_noise_texture.osl @@ -50,7 +50,7 @@ shader node_noise_texture( float Detail = 2.0, point Vector = P, output float Fac = 0.0, - output color Color = color(0.2, 0.2, 0.2)) + output color Color = 0.0) { point p = Vector; diff --git a/intern/cycles/kernel/shaders/node_output_surface.osl b/intern/cycles/kernel/shaders/node_output_surface.osl index 6efaf91121b..da6eedb9f98 100644 --- a/intern/cycles/kernel/shaders/node_output_surface.osl +++ b/intern/cycles/kernel/shaders/node_output_surface.osl @@ -18,7 +18,7 @@ #include "stdosl.h" -surface node_output_surface(closure color Surface = background()) +surface node_output_surface(closure color Surface = 0) { Ci = Surface; } diff --git a/intern/cycles/kernel/shaders/node_output_volume.osl b/intern/cycles/kernel/shaders/node_output_volume.osl index 18094242dc7..ec32ed3fcd2 100644 --- a/intern/cycles/kernel/shaders/node_output_volume.osl +++ b/intern/cycles/kernel/shaders/node_output_volume.osl @@ -18,7 +18,7 @@ #include "stdosl.h" -volume node_output_volume(closure color Volume = background()) +volume node_output_volume(closure color Volume = 0) { Ci = Volume; } diff --git a/intern/cycles/kernel/shaders/node_refraction_bsdf.osl b/intern/cycles/kernel/shaders/node_refraction_bsdf.osl index 0cf9d460c6e..d95a26cdff9 100644 --- a/intern/cycles/kernel/shaders/node_refraction_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_refraction_bsdf.osl @@ -19,12 +19,12 @@ #include "stdosl.h" shader node_refraction_bsdf( - color Color = color(0.8, 0.8, 0.8), + color Color = 0.8, string distribution = "Sharp", float Roughness = 0.2, float IOR = 1.45, normal Normal = N, - output closure color BSDF = diffuse(Normal)) + output closure color BSDF = 0) { float f = max(IOR, 1.0 + 1e-5); float eta = backfacing() ? 1.0 / f: f; diff --git a/intern/cycles/kernel/shaders/node_rgb_curves.osl b/intern/cycles/kernel/shaders/node_rgb_curves.osl index baa1d5c3de4..362bae8a750 100644 --- a/intern/cycles/kernel/shaders/node_rgb_curves.osl +++ b/intern/cycles/kernel/shaders/node_rgb_curves.osl @@ -40,9 +40,9 @@ float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component) shader node_rgb_curves( color ramp[RAMP_TABLE_SIZE] = {0.0}, - color ColorIn = color(0.0, 0.0, 0.0), + color ColorIn = 0.0, float Fac = 0.0, - output color ColorOut = color(0.0, 0.0, 0.0)) + output color ColorOut = 0.0) { ColorOut[0] = ramp_lookup(ramp, ColorIn[0], 0); ColorOut[1] = ramp_lookup(ramp, ColorIn[1], 1); diff --git a/intern/cycles/kernel/shaders/node_rgb_ramp.osl b/intern/cycles/kernel/shaders/node_rgb_ramp.osl index 0df11bb38de..bac4b9552e0 100644 --- a/intern/cycles/kernel/shaders/node_rgb_ramp.osl +++ b/intern/cycles/kernel/shaders/node_rgb_ramp.osl @@ -24,7 +24,7 @@ shader node_rgb_ramp( float ramp_alpha[RAMP_TABLE_SIZE] = {0.0}, float Fac = 0.0, - output color Color = color(0.0, 0.0, 0.0), + output color Color = 0.0, output float Alpha = 1.0) { float f = clamp(Fac, 0.0, 1.0) * (RAMP_TABLE_SIZE - 1); diff --git a/intern/cycles/kernel/shaders/node_separate_rgb.osl b/intern/cycles/kernel/shaders/node_separate_rgb.osl index b48bd7e59d6..0066a1daa91 100644 --- a/intern/cycles/kernel/shaders/node_separate_rgb.osl +++ b/intern/cycles/kernel/shaders/node_separate_rgb.osl @@ -19,7 +19,7 @@ #include "stdosl.h" shader node_separate_rgb( - color Image = color(0.8, 0.8, 0.8), + color Image = 0.8, output float R = 0.0, output float G = 0.0, output float B = 0.0) diff --git a/intern/cycles/kernel/shaders/node_sky_texture.osl b/intern/cycles/kernel/shaders/node_sky_texture.osl index 24a63c78458..13f958d65bd 100644 --- a/intern/cycles/kernel/shaders/node_sky_texture.osl +++ b/intern/cycles/kernel/shaders/node_sky_texture.osl @@ -154,7 +154,7 @@ shader node_sky_texture( vector Vector = P, vector sun_direction = vector(0, 0, 1), float turbidity = 2.2, - output color Color = color(0.0, 0.0, 0.0)) + output color Color = 0.0) { vector p = Vector; diff --git a/intern/cycles/kernel/shaders/node_translucent_bsdf.osl b/intern/cycles/kernel/shaders/node_translucent_bsdf.osl index e7efe73700c..c0a093b35d2 100644 --- a/intern/cycles/kernel/shaders/node_translucent_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_translucent_bsdf.osl @@ -19,9 +19,9 @@ #include "stdosl.h" shader node_translucent_bsdf( - color Color = color(0.8, 0.8, 0.8), + color Color = 0.8, normal Normal = N, - output closure color BSDF = diffuse(Normal)) + output closure color BSDF = 0) { BSDF = Color * translucent(Normal); } diff --git a/intern/cycles/kernel/shaders/node_transparent_bsdf.osl b/intern/cycles/kernel/shaders/node_transparent_bsdf.osl index 875bce3f16c..976b7d5f756 100644 --- a/intern/cycles/kernel/shaders/node_transparent_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_transparent_bsdf.osl @@ -19,9 +19,9 @@ #include "stdosl.h" shader node_transparent_bsdf( - color Color = color(0.8, 0.8, 0.8), + color Color = 0.8, normal Normal = N, - output closure color BSDF = diffuse(Normal)) + output closure color BSDF = 0) { BSDF = Color * transparent(); } diff --git a/intern/cycles/kernel/shaders/node_value.osl b/intern/cycles/kernel/shaders/node_value.osl index bee6f39f2bc..d3672b8c0cf 100644 --- a/intern/cycles/kernel/shaders/node_value.osl +++ b/intern/cycles/kernel/shaders/node_value.osl @@ -21,10 +21,10 @@ shader node_value( float value_value = 0.0, vector vector_value = vector(0.0, 0.0, 0.0), - color color_value = color(0.0, 0.0, 0.0), + color color_value = 0.0, output float Value = 0.0, output vector Vector = vector(0.0, 0.0, 0.0), - output color Color = color(0.0, 0.0, 0.0)) + output color Color = 0.0) { Value = value_value; Vector = vector_value; diff --git a/intern/cycles/kernel/shaders/node_velvet_bsdf.osl b/intern/cycles/kernel/shaders/node_velvet_bsdf.osl index 3aa662bdd08..5506ab20703 100644 --- a/intern/cycles/kernel/shaders/node_velvet_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_velvet_bsdf.osl @@ -20,10 +20,10 @@ #include "node_fresnel.h" shader node_velvet_bsdf( - color Color = color(0.8, 0.8, 0.8), + color Color = 0.8, float Sigma = 0.0, normal Normal = N, - output closure color BSDF = diffuse(Normal)) + output closure color BSDF = 0) { float sigma = clamp(Sigma, 0.0, 1.0); diff --git a/intern/cycles/kernel/shaders/node_voronoi_texture.osl b/intern/cycles/kernel/shaders/node_voronoi_texture.osl index 43f8ecc666a..db8787892d2 100644 --- a/intern/cycles/kernel/shaders/node_voronoi_texture.osl +++ b/intern/cycles/kernel/shaders/node_voronoi_texture.osl @@ -28,7 +28,7 @@ shader node_voronoi_texture( float Scale = 5.0, point Vector = P, output float Fac = 0.0, - output color Color = color(0.0, 0.0, 0.0)) + output color Color = 0.0) { point p = Vector; diff --git a/intern/cycles/kernel/shaders/node_ward_bsdf.osl b/intern/cycles/kernel/shaders/node_ward_bsdf.osl index 82ce15ab9b6..bae55bcceaf 100644 --- a/intern/cycles/kernel/shaders/node_ward_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_ward_bsdf.osl @@ -19,13 +19,13 @@ #include "stdosl.h" shader node_ward_bsdf( - color Color = color(0.8, 0.8, 0.8), + color Color = 0.0, float Roughness = 0.0, float Anisotropy = 0.0, float Rotation = 0.0, normal Normal = N, normal Tangent = normalize(dPdu), - output closure color BSDF = diffuse(Normal)) + output closure color BSDF = 0) { /* rotate tangent around normal */ vector T = Tangent; diff --git a/intern/cycles/kernel/shaders/node_wave_texture.osl b/intern/cycles/kernel/shaders/node_wave_texture.osl index 6648cd06278..11c4689196d 100644 --- a/intern/cycles/kernel/shaders/node_wave_texture.osl +++ b/intern/cycles/kernel/shaders/node_wave_texture.osl @@ -55,7 +55,7 @@ shader node_wave_texture( float DetailScale = 1.0, point Vector = P, output float Fac = 0.0, - output color Color = color (0.0, 0.0, 0.0)) + output color Color = 0.0) { point p = Vector; |