diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2012-08-30 10:31:02 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2012-08-30 10:31:02 +0400 |
commit | ded5e9cd2324eaa28b85d17d0f8d394f72625c8a (patch) | |
tree | eb3d9815e55a3ad8b66e5bf4a8c0b9cf26416c93 /intern/cycles/blender | |
parent | 3f83d273b344221de5ec30c39c305ad5fa486f42 (diff) |
clamp for Mix node
the implementation was following my early commit for Math node
I haven't had a chance to run those through Brecht, but would like to do eventually. (they work fine though)
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 37ab1ddac26..b82fee5edf0 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -221,6 +221,7 @@ static ShaderNode *add_node(BL::BlendData b_data, BL::Scene b_scene, ShaderGraph BL::ShaderNodeMixRGB b_mix_node(b_node); MixNode *mix = new MixNode(); mix->type = MixNode::type_enum[b_mix_node.blend_type()]; + mix->use_clamp = b_mix_node.use_clamp(); node = mix; break; } |