[Bf-blender-cvs] [504454ee5ec] blender2.8: GPUMaterial: Normal Map Node: Make default inputs interactives
Clément Foucault
noreply at git.blender.org
Wed Aug 1 22:10:46 CEST 2018
Commit: 504454ee5ec608de89b07476a8abb91b70ca12a2
Author: Clément Foucault
Date: Wed Aug 1 22:08:08 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB504454ee5ec608de89b07476a8abb91b70ca12a2
GPUMaterial: Normal Map Node: Make default inputs interactives
===================================================================
M source/blender/nodes/shader/nodes/node_shader_normal_map.c
===================================================================
diff --git a/source/blender/nodes/shader/nodes/node_shader_normal_map.c b/source/blender/nodes/shader/nodes/node_shader_normal_map.c
index 3c0fb145987..e4b5aaef72d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_normal_map.c
+++ b/source/blender/nodes/shader/nodes/node_shader_normal_map.c
@@ -63,11 +63,21 @@ static int gpu_shader_normal_map(GPUMaterial *mat, bNode *node, bNodeExecData *U
if (in[0].link)
strength = in[0].link;
+ else if (node->original) {
+ bNodeSocket *socket = BLI_findlink(&node->original->inputs, 0);
+ bNodeSocketValueFloat *socket_data = socket->default_value;
+ strength = GPU_uniform_buffer(&socket_data->value, GPU_FLOAT);
+ }
else
strength = GPU_uniform(in[0].vec);
if (in[1].link)
realnorm = in[1].link;
+ else if (node->original) {
+ bNodeSocket *socket = BLI_findlink(&node->original->inputs, 1);
+ bNodeSocketValueRGBA *socket_data = socket->default_value;
+ realnorm = GPU_uniform_buffer(socket_data->value, GPU_VEC3);
+ }
else
realnorm = GPU_uniform(in[1].vec);
More information about the Bf-blender-cvs
mailing list