make node select_all consistent with other select operators, also add Ctrl+I, select inverse to node space.

1 files changed, 24 insertions, 14 deletions

diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index 1ea763a413d..603603b9f07 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -537,26 +537,34 @@ void NODE_OT_select_border(wmOperatorType *ot)
 
 /* ****** Select/Deselect All ****** */
 
-static int node_select_all_exec(bContext *C, wmOperator *UNUSED(op))
+static int node_select_all_exec(bContext *C, wmOperator *op)
 {
 	SpaceNode *snode = CTX_wm_space_node(C);
-	bNode *first = snode->edittree->nodes.first;
+	ListBase *node_lb = &snode->edittree->nodes;
 	bNode *node;
-	int count= 0;
+	int action = RNA_enum_get(op->ptr, "action");
 
-	for (node=first; node; node=node->next)
-		if (node->flag & NODE_SELECT)
-			count++;
-
-	if (count) {
-		for (node=first; node; node=node->next)
-			node_deselect(node);
+	if (action == SEL_TOGGLE) {
+		if (ED_node_select_check(node_lb))
+			action = SEL_DESELECT;
+		else
+			action = SEL_SELECT;
 	}
-	else {
-		for (node=first; node; node=node->next)
-			node_select(node);
+
+	for (node = node_lb->first; node; node = node->next) {
+		switch (action) {
+			case SEL_SELECT:
+				node_select(node);
+				break;
+			case SEL_DESELECT:
+				node_deselect(node);
+				break;
+			case SEL_INVERT:
+				((node->flag & SELECT) ? node_deselect : node_select)(node);
+				break;
+		}
 	}
-	
+
 	ED_node_sort(snode->edittree);
 	
 	WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
@@ -576,6 +584,8 @@ void NODE_OT_select_all(wmOperatorType *ot)
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	WM_operator_properties_select_all(ot);
 }
 
 /* ****** Select Linked To ****** */