[Bf-blender-cvs] [47949fd764c] blender2.8: Eevee: Codestyle fix.
Clément Foucault
noreply at git.blender.org
Fri May 18 15:24:47 CEST 2018
Commit: 47949fd764c8f7af7dc560794a38d47d63e9ee63
Author: Clément Foucault
Date: Fri May 18 15:33:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB47949fd764c8f7af7dc560794a38d47d63e9ee63
Eevee: Codestyle fix.
===================================================================
M source/blender/gpu/shaders/gpu_shader_material.glsl
M source/blender/nodes/shader/nodes/node_shader_shaderToRgb.c
===================================================================
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 81672b6a046..4306fe17e96 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -2554,7 +2554,7 @@ void node_eevee_specular(
result.ssr_id = int(ssr_id);
}
-void node_shadertorgb(Closure cl, out vec4 outcol, out float outalpha)
+void node_shader_to_rgba(Closure cl, out vec4 outcol, out float outalpha)
{
vec4 spec_accum = vec4(0.0);
if (ssrToggle && cl.ssr_id == outputSsrId) {
diff --git a/source/blender/nodes/shader/nodes/node_shader_shaderToRgb.c b/source/blender/nodes/shader/nodes/node_shader_shaderToRgb.c
index 286752f9a10..c565c311efc 100644
--- a/source/blender/nodes/shader/nodes/node_shader_shaderToRgb.c
+++ b/source/blender/nodes/shader/nodes/node_shader_shaderToRgb.c
@@ -42,7 +42,7 @@ static bNodeSocketTemplate sh_node_shadertorgb_out[] = {
static int node_shader_gpu_shadertorgb(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
{
- return GPU_stack_link(mat, node, "node_shadertorgb", in, out);
+ return GPU_stack_link(mat, node, "node_shader_to_rgba", in, out);
}
/* node type definition */
More information about the Bf-blender-cvs
mailing list