Merge branch 'master' into blender2.8

1 files changed, 27 insertions, 0 deletions

diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c
index d8dc2a62625..f786a293080 100644
--- a/source/blender/nodes/texture/nodes/node_texture_math.c
+++ b/source/blender/nodes/texture/nodes/node_texture_math.c
@@ -195,6 +195,33 @@ static void valuefn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 			break;
 		}
 
+		case NODE_MATH_FLOOR:
+		{
+			*out = floorf(in0);
+			break;
+		}
+
+		case NODE_MATH_CEIL:
+		{
+			*out = ceilf(in0);
+			break;
+		}
+
+		case NODE_MATH_FRACT:
+		{
+			*out = in0 - floorf(in0);
+			break;
+		}
+
+		case NODE_MATH_SQRT:
+		{
+			if (in0 > 0.0f)
+				*out = sqrtf(in0);
+			else
+				*out = 0.0f;
+			break;
+		}
+
 		default:
 		{
 			BLI_assert(0);