Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2020-11-10 20:49:50 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2020-11-10 20:59:30 +0300
commitb980cd163a9d5d77eeffc2e353333e739fa9e719 (patch)
treea91aadc6cfdf9b16560421b716ad3002da51928e /intern/cycles/kernel/shaders/node_musgrave_texture.osl
parenta63208823c8426b76270393f9217d3cf3ef66d0b (diff)
Cycles: fix compilation of OSL shaders following API change
The names of the parameters are based on those of those of the sockets, so they also need to be updated. This was forgotten about in the previous commit (rBa284e559b90e). Ref T82561.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_musgrave_texture.osl')
-rw-r--r--intern/cycles/kernel/shaders/node_musgrave_texture.osl42
1 files changed, 21 insertions, 21 deletions
diff --git a/intern/cycles/kernel/shaders/node_musgrave_texture.osl b/intern/cycles/kernel/shaders/node_musgrave_texture.osl
index d03b84c1ab4..0e71ce74c29 100644
--- a/intern/cycles/kernel/shaders/node_musgrave_texture.osl
+++ b/intern/cycles/kernel/shaders/node_musgrave_texture.osl
@@ -684,7 +684,7 @@ float noise_musgrave_ridged_multi_fractal_4d(
shader node_musgrave_texture(
int use_mapping = 0,
matrix mapping = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
- string type = "fBM",
+ string musgrave_type = "fBM",
string dimensions = "3D",
point Vector = P,
float W = 0.0,
@@ -707,21 +707,21 @@ shader node_musgrave_texture(
if (dimensions == "1D") {
float p = W * Scale;
- if (type == "multifractal") {
+ if (musgrave_type == "multifractal") {
Fac = noise_musgrave_multi_fractal_1d(p, dimension, lacunarity, octaves);
}
- else if (type == "fBM") {
+ else if (musgrave_type == "fBM") {
Fac = noise_musgrave_fBm_1d(p, dimension, lacunarity, octaves);
}
- else if (type == "hybrid_multifractal") {
+ else if (musgrave_type == "hybrid_multifractal") {
Fac = noise_musgrave_hybrid_multi_fractal_1d(
p, dimension, lacunarity, octaves, Offset, Gain);
}
- else if (type == "ridged_multifractal") {
+ else if (musgrave_type == "ridged_multifractal") {
Fac = noise_musgrave_ridged_multi_fractal_1d(
p, dimension, lacunarity, octaves, Offset, Gain);
}
- else if (type == "hetero_terrain") {
+ else if (musgrave_type == "hetero_terrain") {
Fac = noise_musgrave_hetero_terrain_1d(p, dimension, lacunarity, octaves, Offset);
}
else {
@@ -730,21 +730,21 @@ shader node_musgrave_texture(
}
else if (dimensions == "2D") {
vector2 p = vector2(s[0], s[1]) * Scale;
- if (type == "multifractal") {
+ if (musgrave_type == "multifractal") {
Fac = noise_musgrave_multi_fractal_2d(p, dimension, lacunarity, octaves);
}
- else if (type == "fBM") {
+ else if (musgrave_type == "fBM") {
Fac = noise_musgrave_fBm_2d(p, dimension, lacunarity, octaves);
}
- else if (type == "hybrid_multifractal") {
+ else if (musgrave_type == "hybrid_multifractal") {
Fac = noise_musgrave_hybrid_multi_fractal_2d(
p, dimension, lacunarity, octaves, Offset, Gain);
}
- else if (type == "ridged_multifractal") {
+ else if (musgrave_type == "ridged_multifractal") {
Fac = noise_musgrave_ridged_multi_fractal_2d(
p, dimension, lacunarity, octaves, Offset, Gain);
}
- else if (type == "hetero_terrain") {
+ else if (musgrave_type == "hetero_terrain") {
Fac = noise_musgrave_hetero_terrain_2d(p, dimension, lacunarity, octaves, Offset);
}
else {
@@ -753,21 +753,21 @@ shader node_musgrave_texture(
}
else if (dimensions == "3D") {
vector3 p = s * Scale;
- if (type == "multifractal") {
+ if (musgrave_type == "multifractal") {
Fac = noise_musgrave_multi_fractal_3d(p, dimension, lacunarity, octaves);
}
- else if (type == "fBM") {
+ else if (musgrave_type == "fBM") {
Fac = noise_musgrave_fBm_3d(p, dimension, lacunarity, octaves);
}
- else if (type == "hybrid_multifractal") {
+ else if (musgrave_type == "hybrid_multifractal") {
Fac = noise_musgrave_hybrid_multi_fractal_3d(
p, dimension, lacunarity, octaves, Offset, Gain);
}
- else if (type == "ridged_multifractal") {
+ else if (musgrave_type == "ridged_multifractal") {
Fac = noise_musgrave_ridged_multi_fractal_3d(
p, dimension, lacunarity, octaves, Offset, Gain);
}
- else if (type == "hetero_terrain") {
+ else if (musgrave_type == "hetero_terrain") {
Fac = noise_musgrave_hetero_terrain_3d(p, dimension, lacunarity, octaves, Offset);
}
else {
@@ -776,21 +776,21 @@ shader node_musgrave_texture(
}
else if (dimensions == "4D") {
vector4 p = vector4(s[0], s[1], s[2], W) * Scale;
- if (type == "multifractal") {
+ if (musgrave_type == "multifractal") {
Fac = noise_musgrave_multi_fractal_4d(p, dimension, lacunarity, octaves);
}
- else if (type == "fBM") {
+ else if (musgrave_type == "fBM") {
Fac = noise_musgrave_fBm_4d(p, dimension, lacunarity, octaves);
}
- else if (type == "hybrid_multifractal") {
+ else if (musgrave_type == "hybrid_multifractal") {
Fac = noise_musgrave_hybrid_multi_fractal_4d(
p, dimension, lacunarity, octaves, Offset, Gain);
}
- else if (type == "ridged_multifractal") {
+ else if (musgrave_type == "ridged_multifractal") {
Fac = noise_musgrave_ridged_multi_fractal_4d(
p, dimension, lacunarity, octaves, Offset, Gain);
}
- else if (type == "hetero_terrain") {
+ else if (musgrave_type == "hetero_terrain") {
Fac = noise_musgrave_hetero_terrain_4d(p, dimension, lacunarity, octaves, Offset);
}
else {