diff options
| author | Campbell Barton <campbell@blender.org> | 2022-05-18 07:25:05 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-05-18 07:39:48 +0300 |
| commit | d7053ba030f62c8eb597f6aa24525a96b3c42a17 (patch) | |
| tree | 5c7ee720975dbd4dedd1ee479d8ee331cac01171 /source/blender/editors/space_node/node_intern.hh | |
| parent | ffbeb34f5faa8d0d5d5adb946bc8686e1f638fba (diff) | |
Fix T98191: Alt-LMB for node detach fails with RMB select
Regression caused by [0] which changed node selection to use
PRESS for selection and CLICK_DRAG to transform the selection.
This conflicted with Alt-LMB which would select the node then
pass-though to node.background_sample, preventing the drag event
from being activated.
Resolve by only activating background-sample when the cursor
isn't over a node or socket.
[0]: 4c3e91e5f565b81dd79b5d42f55be5b93662d410
Diffstat (limited to 'source/blender/editors/space_node/node_intern.hh')
| -rw-r--r-- | source/blender/editors/space_node/node_intern.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_intern.hh b/source/blender/editors/space_node/node_intern.hh index 4157176cd68..6d7348bfffc 100644 --- a/source/blender/editors/space_node/node_intern.hh +++ b/source/blender/editors/space_node/node_intern.hh @@ -123,8 +123,6 @@ ENUM_OPERATORS(NodeResizeDirection, NODE_RESIZE_LEFT); */ float2 space_node_group_offset(const SpaceNode &snode); -rctf node_frame_rect_inside(const bNode &node); - int node_get_resize_cursor(NodeResizeDirection directions); /** * Usual convention here would be #node_socket_get_color(), @@ -161,6 +159,9 @@ void node_keymap(wmKeyConfig *keyconf); /* node_select.cc */ +rctf node_frame_rect_inside(const bNode &node); +bool node_or_socket_isect_event(bContext *C, const wmEvent *event); + void node_deselect_all(SpaceNode &snode); void node_socket_select(bNode *node, bNodeSocket &sock); void node_socket_deselect(bNode *node, bNodeSocket &sock, bool deselect_node); |