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
path: root/intern
diff options
context:
space:
mode:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2020-11-10 17:18:40 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2020-11-10 18:05:47 +0300
commita284e559b90eb6d6824fc0f3e263ec7de1b4a49f (patch)
treee1a4036ea66b34237a2051fadf725d92e5bf8cc1 /intern
parentfeb71f1d714887715fd9319c91edfe71eddb4a56 (diff)
Fix T82561: shader compilation crashes in OSL
The "type" sockets on shader nodes were renamed in rB31a620b9420cab to avoid clashes with the `NodeType type` member from the Node base class, but the OSL shader compilation was missing those changes.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/nodes.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 43dff896db7..bde573bf0dc 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -959,7 +959,7 @@ void SkyTextureNode::compile(OSLCompiler &compiler)
else
assert(false);
- compiler.parameter(this, "type");
+ compiler.parameter(this, "sky_type");
compiler.parameter("theta", sunsky.theta);
compiler.parameter("phi", sunsky.phi);
compiler.parameter_color("radiance",
@@ -1027,7 +1027,7 @@ void GradientTextureNode::compile(OSLCompiler &compiler)
{
tex_mapping.compile(compiler);
- compiler.parameter(this, "type");
+ compiler.parameter(this, "gradient_type");
compiler.add(this, "node_gradient_texture");
}
@@ -1437,7 +1437,7 @@ void MusgraveTextureNode::compile(OSLCompiler &compiler)
{
tex_mapping.compile(compiler);
- compiler.parameter(this, "type");
+ compiler.parameter(this, "musgrave_type");
compiler.parameter(this, "dimensions");
compiler.add(this, "node_musgrave_texture");
}
@@ -1537,7 +1537,7 @@ void WaveTextureNode::compile(OSLCompiler &compiler)
{
tex_mapping.compile(compiler);
- compiler.parameter(this, "type");
+ compiler.parameter(this, "wave_type");
compiler.parameter(this, "bands_direction");
compiler.parameter(this, "rings_direction");
compiler.parameter(this, "profile");
@@ -1983,7 +1983,7 @@ void MappingNode::compile(SVMCompiler &compiler)
void MappingNode::compile(OSLCompiler &compiler)
{
- compiler.parameter(this, "type");
+ compiler.parameter(this, "mapping_type");
compiler.add(this, "node_mapping");
}
@@ -4926,7 +4926,7 @@ void MixNode::compile(SVMCompiler &compiler)
void MixNode::compile(OSLCompiler &compiler)
{
- compiler.parameter(this, "type");
+ compiler.parameter(this, "mix_type");
compiler.parameter(this, "use_clamp");
compiler.add(this, "node_mix");
}
@@ -5846,7 +5846,7 @@ void MapRangeNode::compile(SVMCompiler &compiler)
void MapRangeNode::compile(OSLCompiler &compiler)
{
- compiler.parameter(this, "type");
+ compiler.parameter(this, "range_type");
compiler.add(this, "node_map_range");
}
@@ -5907,7 +5907,7 @@ void ClampNode::compile(SVMCompiler &compiler)
void ClampNode::compile(OSLCompiler &compiler)
{
- compiler.parameter(this, "type");
+ compiler.parameter(this, "clamp_type");
compiler.add(this, "node_clamp");
}
@@ -6074,7 +6074,7 @@ void MathNode::compile(SVMCompiler &compiler)
void MathNode::compile(OSLCompiler &compiler)
{
- compiler.parameter(this, "type");
+ compiler.parameter(this, "math_type");
compiler.add(this, "node_math");
}
@@ -6185,7 +6185,7 @@ void VectorMathNode::compile(SVMCompiler &compiler)
void VectorMathNode::compile(OSLCompiler &compiler)
{
- compiler.parameter(this, "type");
+ compiler.parameter(this, "math_type");
compiler.add(this, "node_vector_math");
}
@@ -6241,7 +6241,7 @@ void VectorRotateNode::compile(SVMCompiler &compiler)
void VectorRotateNode::compile(OSLCompiler &compiler)
{
- compiler.parameter(this, "type");
+ compiler.parameter(this, "rotate_type");
compiler.parameter(this, "invert");
compiler.add(this, "node_vector_rotate");
}
@@ -6288,7 +6288,7 @@ void VectorTransformNode::compile(SVMCompiler &compiler)
void VectorTransformNode::compile(OSLCompiler &compiler)
{
- compiler.parameter(this, "type");
+ compiler.parameter(this, "transform_type");
compiler.parameter(this, "convert_from");
compiler.parameter(this, "convert_to");
compiler.add(this, "node_vector_transform");