blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T86373: crash picking colors in geometry nodesockets 

Caused by {rB85421c4fab02}.

Above commit treated `SOCK_RGBA` and `SOCK_STRING` the same in
`std_node_socket_draw`.
That would turn a RGBA button into a text button (for attribute search),
leading to trouble.
Note these were just treated the same prior to above commit because both
were doing the layout split.

Now just give RGBA sockets their own case.

Maniphest Tasks: T86373

Differential Revision: https://developer.blender.org/D10646
This commit is contained in:
Philipp Oeser 2021-03-08 13:38:42 +01:00
parent 1775ea74c1
commit 9ba1ff1c63
Notes: blender-bot 2023-02-14 05:12:59 +01:00 
Referenced by issue #86373, Crash picking colors in geometry nodesockets
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_node/drawnode.c
View File

@ -3385,7 +3385,12 @@ static void std_node_socket_draw(
}
}
break;
case SOCK_RGBA:
case SOCK_RGBA: {
uiLayout *row = uiLayoutSplit(layout, 0.5f, false);
uiItemL(row, text, 0);
uiItemR(row, ptr, "default_value", DEFAULT_FLAGS, "", 0);
break;
}
case SOCK_STRING: {
uiLayout *row = uiLayoutSplit(layout, 0.5f, false);
uiItemL(row, text, 0);