griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #129522: renaming sockets in node does not work for some types

Browse Source
This commit is contained in:
Jacques Lucke
2024-11-07 13:27:07 +01:00
parent 0e0939b83f
commit 59bc3f0959
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/space_node/drawnode.cc
View File

@@ -1234,7 +1234,7 @@ static void draw_gizmo_pin_icon(uiLayout *layout, PointerRNA *socket_ptr)
uiItemR(layout, socket_ptr, "pin_gizmo", UI_ITEM_NONE, "", ICON_GIZMO);
}
static void draw_node_socket_without_value(uiLayout *layout, bNodeSocket *sock, const char *text)
static void draw_node_socket_name_editable(uiLayout *layout, bNodeSocket *sock, const char *text)
{
if (sock->runtime->declaration) {
if (sock->runtime->declaration->socket_name_rna) {
@@ -1251,6 +1251,11 @@ static void draw_node_socket_without_value(uiLayout *layout, bNodeSocket *sock,
uiItemL(layout, text, ICON_NONE);
}
static void draw_node_socket_without_value(uiLayout *layout, bNodeSocket *sock, const char *text)
{
draw_node_socket_name_editable(layout, sock, text);
}
static void std_node_socket_draw(
bContext *C, uiLayout *layout, PointerRNA *ptr, PointerRNA *node_ptr, const char *text)
{
@@ -1336,7 +1341,7 @@ static void std_node_socket_draw(
uiLayout *column = uiLayoutColumn(layout, false);
{
uiLayout *row = uiLayoutRow(column, true);
uiItemL(row, text, ICON_NONE);
draw_node_socket_name_editable(row, sock, text);
if (has_gizmo) {
draw_gizmo_pin_icon(row, ptr);
gizmo_handled = true;
@@ -1350,7 +1355,7 @@ static void std_node_socket_draw(
uiLayout *column = uiLayoutColumn(layout, false);
{
uiLayout *row = uiLayoutRow(column, true);
uiItemL(row, text, ICON_NONE);
draw_node_socket_name_editable(row, sock, text);
if (has_gizmo) {
draw_gizmo_pin_icon(row, ptr);
gizmo_handled = true;
@@ -1360,7 +1365,7 @@ static void std_node_socket_draw(
break;
}
case SOCK_MATRIX: {
uiItemL(layout, text, ICON_NONE);
draw_node_socket_name_editable(layout, sock, text);
break;
}
case SOCK_RGBA: {