[Bf-blender-cvs] [fbfa53ae1d3] blender2.8: GPUMaterial: Remove unused Normal input.

Clément Foucault noreply at git.blender.org
Thu May 4 19:12:43 CEST 2017


Commit: fbfa53ae1d3fae3aa59bfa22e9f5066df4c5a739
Author: Clément Foucault
Date:   Thu May 4 17:40:28 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBfbfa53ae1d3fae3aa59bfa22e9f5066df4c5a739

GPUMaterial: Remove unused Normal input.

===================================================================

M	source/blender/gpu/shaders/gpu_shader_material.glsl
M	source/blender/nodes/shader/nodes/node_shader_background.c

===================================================================

diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index df639f7047e..845b454e2e4 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -2836,7 +2836,7 @@ void environment_default_vector(out vec3 worldvec)
 }
 #endif
 
-void node_background(vec4 color, float strength, vec3 N, out vec4 result)
+void node_background(vec4 color, float strength, out vec4 result)
 {
 	result = color * strength;
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_background.c b/source/blender/nodes/shader/nodes/node_shader_background.c
index b387529e456..e4d635994b4 100644
--- a/source/blender/nodes/shader/nodes/node_shader_background.c
+++ b/source/blender/nodes/shader/nodes/node_shader_background.c
@@ -42,7 +42,7 @@ static bNodeSocketTemplate sh_node_background_out[] = {
 
 static int node_shader_gpu_background(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
 {
-	return GPU_stack_link(mat, "node_background", in, out, GPU_builtin(GPU_VIEW_NORMAL));
+	return GPU_stack_link(mat, "node_background", in, out);
 }
 
 /* node type definition */




More information about the Bf-blender-cvs mailing list