Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 25 May 2018 08:04:25 +0000 (10:04 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 25 May 2018 08:04:25 +0000 (10:04 +0200)
1  2 
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_view3d/view3d_project.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
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:
 -                      GPU_stack_link(mat, names[node->custom1], in, out);
+               case NODE_MATH_ATAN2:
 +                      GPU_stack_link(mat, node, names[node->custom1], in, out);
                        break;
                case NODE_MATH_SIN:
                case NODE_MATH_COS: