[Bf-blender-cvs] [ac2f608] master: Fix T43450: Texture node tree failed to clamp

Kévin Dietrich noreply at git.blender.org
Wed Feb 4 21:20:44 CET 2015


Commit: ac2f608fa3541ef96a6aeb5e97e9c408f4778bfd
Author: Kévin Dietrich
Date:   Thu Feb 5 01:18:02 2015 +0500
Branches: master
https://developer.blender.org/rBac2f608fa3541ef96a6aeb5e97e9c408f4778bfd

Fix T43450: Texture node tree failed to clamp

Clamping routine was not implemented. This fixes T43450.

Reviewers: #nodes, #rendering, sergey

Reviewed By: sergey

Maniphest Tasks: T43450

Differential Revision: https://developer.blender.org/D1038

===================================================================

M	source/blender/nodes/texture/nodes/node_texture_math.c

===================================================================

diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c
index 1984ee5..19bc16f 100644
--- a/source/blender/nodes/texture/nodes/node_texture_math.c
+++ b/source/blender/nodes/texture/nodes/node_texture_math.c
@@ -195,6 +195,10 @@ static void valuefn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 			break;
 		}
 	}
+
+	if (node->custom2 & SHD_MATH_CLAMP) {
+		CLAMP(*out, 0.0f, 1.0f);
+	}
 }
 
 static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *execdata, bNodeStack **in, bNodeStack **out)




More information about the Bf-blender-cvs mailing list