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:
Diffstat (limited to 'intern/cycles/render/shader.cpp')
-rw-r--r--intern/cycles/render/shader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 2d3cac45935..5ecbd92d96d 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -194,7 +194,7 @@ NODE_DEFINE(Shader)
return type;
}
-Shader::Shader() : Node(node_type)
+Shader::Shader() : Node(get_node_type())
{
pass_id = 0;
@@ -245,7 +245,7 @@ bool Shader::is_constant_emission(float3 *emission)
return false;
}
- if (surf->link->parent->type == EmissionNode::node_type) {
+ if (surf->link->parent->type == EmissionNode::get_node_type()) {
EmissionNode *node = (EmissionNode *)surf->link->parent;
assert(node->input("Color"));
@@ -257,7 +257,7 @@ bool Shader::is_constant_emission(float3 *emission)
*emission = node->get_color() * node->get_strength();
}
- else if (surf->link->parent->type == BackgroundNode::node_type) {
+ else if (surf->link->parent->type == BackgroundNode::get_node_type()) {
BackgroundNode *node = (BackgroundNode *)surf->link->parent;
assert(node->input("Color"));