Merge branch 'master' into blender2.8

2018-05-25 10:04:25 +02:00
parent 2a6e4f7157 d02335a195
commit ef22d2e8ad
16 changed files with 71 additions and 0 deletions
--- a/source/blender/nodes/texture/nodes/node_texture_math.c
+++ b/source/blender/nodes/texture/nodes/node_texture_math.c
@@ -189,6 +189,12 @@ static void valuefn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 			break;
 		}

+		case NODE_MATH_ATAN2:
+		{
+			*out = atan2(in0, in1);
+			break;
+		}
+
 		default:
 		{
 			BLI_assert(0);