[Bf-blender-cvs] [234801c] master: Fix T48587, constant fold should only be done for Mix Type.

Thomas Dinges noreply at git.blender.org
Sat Jun 4 21:39:27 CEST 2016


Commit: 234801c8dc42f0f24e6f90691451b462942ffe56
Author: Thomas Dinges
Date:   Sat Jun 4 21:39:07 2016 +0200
Branches: master
https://developer.blender.org/rB234801c8dc42f0f24e6f90691451b462942ffe56

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;
 	}




More information about the Bf-blender-cvs mailing list