[Bf-blender-cvs] [32ba1ce] master: Fix T38603: Output File node sockets were drawing the regular socket label in addition to the actual specialized socket ui.

Lukas Tönne noreply at git.blender.org
Wed Feb 19 12:00:39 CET 2014


Commit: 32ba1ce1c1e19a736da60b6a8c7d8531f084d614
Author: Lukas Tönne
Date:   Wed Feb 19 11:54:28 2014 +0100
https://developer.blender.org/rB32ba1ce1c1e19a736da60b6a8c7d8531f084d614

Fix T38603: Output File node sockets were drawing the regular socket
label in addition to the actual specialized socket ui.

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

M	source/blender/editors/space_node/drawnode.c

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

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 0c92399..effb8eb 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -2867,6 +2867,7 @@ static void std_node_socket_draw(bContext *C, uiLayout *layout, PointerRNA *ptr,
 	/* XXX not nice, eventually give this node its own socket type ... */
 	if (node->type == CMP_NODE_OUTPUT_FILE) {
 		node_file_output_socket_draw(C, layout, ptr, node_ptr);
+		return;
 	}
 	
 	if ((sock->in_out == SOCK_OUT) || (sock->flag & SOCK_IN_USE) || (sock->flag & SOCK_HIDE_VALUE)) {




More information about the Bf-blender-cvs mailing list