[Bf-blender-cvs] [43f33ea3005] master: Node selection: Stop operator when mouse selection selected a node

Sergey Sharybin noreply at git.blender.org
Mon Dec 11 17:40:59 CET 2017


Commit: 43f33ea30052b525b5cee5cea2a9e6431597660c
Author: Sergey Sharybin
Date:   Mon Dec 11 17:38:47 2017 +0100
Branches: master
https://developer.blender.org/rB43f33ea30052b525b5cee5cea2a9e6431597660c

Node selection: Stop operator when mouse selection selected a node

Previously, hitting Shift-LMB will first invoke selection operator, which
then later on is transformed to mouse tweak used for reroute operator.

This was causing problems extending selection with Shift-LMB when clicking
fast or from a tablet.

===================================================================

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 dc7863bb354..c684b98ce55 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -476,9 +476,8 @@ static int node_select_exec(bContext *C, wmOperator *op)
 	if (node_mouse_select(bmain, snode, ar, mval, extend)) {
 		/* send notifiers */
 		WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
-		
-		/* allow tweak event to work too */
-		return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
+
+		return OPERATOR_FINISHED;
 	}
 	else {
 		/* allow tweak event to work too */



More information about the Bf-blender-cvs mailing list