From 25f1783673de636a6f0ca4457df8c05bc685981a Mon Sep 17 00:00:00 2001 From: OmarSquircleArt Date: Fri, 16 Aug 2019 17:59:12 +0200 Subject: Fix T68702: Input socket in the Normal node isn't drawn properly. The Normal vector socket in the Normal node wasn't drawn properly and couldn't be controlled. Additionally, the socket name was drawn over it. This happened because the socket had a default value of a zero vector. To fix this, we set the default value to the unit vector `(0, 0, 1)`. Moreover, we don't draw the UI name if the subtype is `PROP_DIRECTION`. Reviewers: brecht Differential Revision: https://developer.blender.org/D5503 --- source/blender/editors/space_node/drawnode.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_node') diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 748e485f614..c3ecc34aaf4 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -3358,8 +3358,13 @@ static void std_node_socket_draw( uiTemplateComponentMenu(layout, ptr, "default_value", text); } else { - uiLayout *column = uiLayoutColumn(layout, true); - uiItemR(column, ptr, "default_value", 0, text, 0); + if (sock->typeinfo->subtype == PROP_DIRECTION) { + uiItemR(layout, ptr, "default_value", 0, "", ICON_NONE); + } + else { + uiLayout *column = uiLayoutColumn(layout, true); + uiItemR(column, ptr, "default_value", 0, text, ICON_NONE); + } } break; case SOCK_RGBA: -- cgit v1.2.3