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:
authorThomas Dinges <blender@dingto.org>2016-06-04 22:39:07 +0300
committerThomas Dinges <blender@dingto.org>2016-06-04 22:39:07 +0300
commit234801c8dc42f0f24e6f90691451b462942ffe56 (patch)
treeda7f6325392a1b7b584278b4de05a8df33b409fd /intern/cycles
parent1d8637ec69275b4958034b112db81f4cf42cd521 (diff)
Fix T48587, constant fold should only be done for Mix Type.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/render/nodes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 4656b3de9f3..df0fee63113 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -3383,7 +3383,7 @@ void MixNode::compile(OSLCompiler& compiler)
bool MixNode::constant_fold(ShaderGraph *graph, ShaderOutput *, ShaderInput *optimized)
{
- if(type != ustring("Mix")) {
+ if(type != NODE_MIX_BLEND) {
return false;
}