Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2019-05-23 17:23:44 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-05-23 17:37:08 +0300
commit5c0e282a73935051efaab9d089590e6d4f627b97 (patch)
tree1040c0dee42ef62580b1d76576868e1f8790fd41 /source
parent7db03a6baa472e4f4daf76a95cc2291fa2599722 (diff)
Revert "Fix T64660: no access to node connectors when a node is inside a layout frame."
This reverts commit 59b7f3a16463f2286a8349028f15e7e7a3be06dc, which was causing T64933.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_node/node_select.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index a8331c26ce6..aab328249fe 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -495,17 +495,7 @@ static int node_mouse_select(bContext *C,
}
}
- /* In case we do two-steps selection, we do not want to select the node if some valid socket
- * is below the mouse, as that would prevent draging from sockets (NODE_OT_link)
- * to be properly triggered. See T64660. */
- if (wait_to_deselect_others) {
- if (node_find_indicated_socket(snode, &node, &sock, cursor, SOCK_IN) ||
- node_find_indicated_socket(snode, &node, &sock, cursor, SOCK_OUT)) {
- ret_value = OPERATOR_CANCELLED;
- }
- }
-
- if (sock == NULL) {
+ if (!sock) {
/* find the closest visible node */
node = node_under_mouse_select(snode->edittree, (int)cursor[0], (int)cursor[1]);