Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor

Conflicts:
	source/blender/nodes/texture/nodes/node_texture_math.c

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/nodes/shader/nodes/node_shader_normal.c b/source/blender/nodes/shader/nodes/node_shader_normal.c
index fcd738f0b15..092fc201aa7 100644
--- a/source/blender/nodes/shader/nodes/node_shader_normal.c
+++ b/source/blender/nodes/shader/nodes/node_shader_normal.c
@@ -61,12 +61,12 @@ static void node_shader_exec_normal(void *UNUSED(data), int UNUSED(thread), bNod
 static int gpu_shader_normal(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
 {
 	GPUNodeLink *vec = GPU_uniform(out[0].vec);
-	int ret = GPU_stack_link(mat, "normal", in, out, vec);
-	if (ret && GPU_material_use_new_shading_nodes(mat)) {
-		float fac[3] = {1.0f, 0.0f, 0.0f};
-		GPU_link(mat, "invert", GPU_uniform(fac), out[1].link, &out[1].link);
+	if (GPU_material_use_new_shading_nodes(mat)) {
+		return GPU_stack_link(mat, "normal_new_shading", in, out, vec);
+	}
+	else {
+		return GPU_stack_link(mat, "normal", in, out, vec);
 	}
-	return ret;
 }
 
 void register_node_type_sh_normal(void)