Commit: ef22d2e8adb9965cd3cb91e733d4b9754cf6024f
Author: Campbell Barton
Date: Fri May 25 10:04:25 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBef22d2e8adb9965cd3cb91e733d4b9754cf6024f
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/nodes/shader/nodes/node_shader_math.c
index 6cd58d2fb85,9fa906729dc..f36310f4d00
--- a/source/blender/nodes/shader/nodes/node_shader_math.c
+++ b/source/blender/nodes/shader/nodes/node_shader_math.c
@@@ -249,7 -255,8 +255,8 @@@ static int gpu_shader_math(GPUMaterial
case NODE_MATH_LESS:
case NODE_MATH_GREATER:
case NODE_MATH_MOD:
+ case NODE_MATH_ATAN2:
- GPU_stack_link(mat, names[node->custom1], in, out);
+ GPU_stack_link(mat, node, names[node->custom1], in,
out);
break;
case NODE_MATH_SIN:
case NODE_MATH_COS:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
