[Bf-blender-cvs] [103e38c] master: Fix T46415: empty node group in GLSL shader has incorrect socket type conversion.

Brecht Van Lommel noreply at git.blender.org
Fri Oct 9 01:31:24 CEST 2015


Commit: 103e38cbec9c056a3eeefb887ded81ab527ae362
Author: Brecht Van Lommel
Date:   Fri Oct 9 01:26:32 2015 +0200
Branches: master
https://developer.blender.org/rB103e38cbec9c056a3eeefb887ded81ab527ae362

Fix T46415: empty node group in GLSL shader has incorrect socket type conversion.

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

M	source/blender/nodes/shader/node_shader_util.c

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

diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c
index 4988138..92b244b 100644
--- a/source/blender/nodes/shader/node_shader_util.c
+++ b/source/blender/nodes/shader/node_shader_util.c
@@ -141,7 +141,7 @@ void node_gpu_stack_from_data(struct GPUNodeStack *gs, int type, bNodeStack *ns)
 {
 	memset(gs, 0, sizeof(*gs));
 	
-	copy_v4_v4(gs->vec, ns->vec);
+	nodestack_get_vec(gs->vec, type, ns);
 	gs->link = ns->data;
 	
 	if (type == SOCK_FLOAT)




More information about the Bf-blender-cvs mailing list