blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Revert "Outliner: only activate outliner items when clicking on icon/text" 

The soc-2019-outliner branch relied on the previous behavior,
since this is going to be merged soon, postpone this change.

This reverts commit 9dab57a9f8.
This commit is contained in:
Campbell Barton 2019-08-17 01:25:06 +10:00
parent 66bd96e0bb
commit 39288768b5
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/space_outliner/outliner_select.c
View File

@ -1305,15 +1305,8 @@ static int outliner_item_do_activate_from_cursor(bContext *C,
TreeStoreElem *activate_tselem = TREESTORE(activate_te);
outliner_item_select(soops, activate_te, extend, extend);
/* Only change modes when clicking on the icon/text,
* otherwise we can't easily select without changing modes. */
if ((te->flag & TE_ICONROW) == 0) {
if (view_mval[0] >= te->xs && view_mval[0] <= te->xend) {
do_outliner_item_activate_tree_element(
C, scene, view_layer, soops, activate_te, activate_tselem, extend, recursive);
}
}
do_outliner_item_activate_tree_element(
C, scene, view_layer, soops, activate_te, activate_tselem, extend, recursive);
changed = true;
}