Commit: 56b17333a5c5357e9a78b1cbd46f4af82b6e6815
Author: Thomas Dinges
Date: Sat Jun 4 21:39:07 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB56b17333a5c5357e9a78b1cbd46f4af82b6e6815
Fix T48587, constant fold should only be done for Mix Type.
===================================================================
M intern/cycles/render/nodes.cpp
===================================================================
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 4656b3d..df0fee6 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
