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:
authorCampbell Barton <ideasman42@gmail.com>2019-08-16 18:25:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-08-16 18:25:11 +0300
commit39288768b5740fa621a1355334ffa878bfaa33b0 (patch)
treeed031cb48fe4e3158752a8241f72119db4ab8531
parent66bd96e0bb927f9cd529048a4a2219fede956c6e (diff)
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 9dab57a9f829881dad1e659b53413ded15ec085e.
-rw-r--r--source/blender/editors/space_outliner/outliner_select.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 7f45c4d22fa..c932766ab93 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -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;
}