[Bf-blender-cvs] [5c0e282a739] master: Revert "Fix T64660: no access to node connectors when a node is inside a layout frame."
Bastien Montagne
noreply at git.blender.org
Thu May 23 16:37:19 CEST 2019
Commit: 5c0e282a73935051efaab9d089590e6d4f627b97
Author: Bastien Montagne
Date: Thu May 23 16:23:44 2019 +0200
Branches: master
https://developer.blender.org/rB5c0e282a73935051efaab9d089590e6d4f627b97
Revert "Fix T64660: no access to node connectors when a node is inside a layout frame."
This reverts commit 59b7f3a16463f2286a8349028f15e7e7a3be06dc, which was
causing T64933.
===================================================================
M source/blender/editors/space_node/node_select.c
===================================================================
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]);
More information about the Bf-blender-cvs
mailing list