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
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-03-24 14:13:14 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-03-25 19:05:35 +0300
commit926f7612fd75078f5fb802d165f9c25af0bdb0df (patch)
tree98cec5f5eda50c6aa19e8d48a5c661d7dac622a7 /source/blender/editors
parent25c41186514c5bcd946ef1bf8aeb17d11c9910de (diff)
Fix T86867: Node Editor: Avoid deselect-all triggering on every box-
select In 'Set/Replace' mode this is not a problem, but 'Extend' or 'Subtract' modes were useless with the current behavior. The problem here is that 'node.select' fires before 'node.select_box' (which is fine) but deselects immediately on click. This issue has come up before in other editors, see {T70457} {rB395dfff103e1} {rBa8ea1ea1b7d5} Now delay deselection in empty space to mouse release (same as done in before mentioned report). also related: ref T57918 ref T63994 Maniphest Task: T86867 Differential Revision: https://developer.blender.org/D10801
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_node/node_select.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index 1da79671c8e..6548f6f5775 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -568,11 +568,19 @@ static int node_mouse_select(bContext *C,
}
}
else if (deselect_all && node == NULL) {
- /* Deselect in empty space. */
- for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next) {
- nodeSetSelected(tnode, false);
+ /* Rather than deselecting others, users may want to drag to box-select (drag from empty
+ * space) or tweak-translate an already selected item. If these cases may apply, delay
+ * deselection. */
+ if (wait_to_deselect_others) {
+ ret_value = OPERATOR_RUNNING_MODAL;
+ }
+ else {
+ /* Deselect in empty space. */
+ for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next) {
+ nodeSetSelected(tnode, false);
+ }
+ ret_value = OPERATOR_FINISHED;
}
- ret_value = OPERATOR_FINISHED;
}
else if (node != NULL) {
/* When clicking on an already selected node, we want to wait to deselect