[Bf-blender-cvs] [5d7a7dd7a03] soc-2019-outliner: Outliner: Fix crash on modifier key click in empty space
Nathan Craddock
noreply at git.blender.org
Fri Jun 7 06:56:21 CEST 2019
Commit: 5d7a7dd7a03ec6ff55437326213ae6d391ed468c
Author: Nathan Craddock
Date: Thu Jun 6 22:40:34 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB5d7a7dd7a03ec6ff55437326213ae6d391ed468c
Outliner: Fix crash on modifier key click in empty space
I changed this line earlier, I think while implementing box selection.
Changing it back to what it was before I modified it solved the issue.
===================================================================
M source/blender/editors/space_outliner/outliner_select.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 8e0a52c032e..4ce439fb9a6 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -1334,11 +1334,11 @@ static int outliner_item_do_activate_from_cursor(bContext *C,
return OPERATOR_CANCELLED;
}
- te = outliner_find_item_at_y(soops, &soops->tree, view_mval[1]);
-
- if (!te && deselect_all) {
- outliner_flag_set(&soops->tree, TSE_SELECTED, false);
- changed = true;
+ if (!(te = outliner_find_item_at_y(soops, &soops->tree, view_mval[1]))) {
+ if (deselect_all) {
+ outliner_flag_set(&soops->tree, TSE_SELECTED, false);
+ changed = true;
+ }
}
/* Don't allow toggle on scene collection */
else if ((TREESTORE(te)->type != TSE_VIEW_COLLECTION_BASE) &&
More information about the Bf-blender-cvs
mailing list