[Bf-blender-cvs] [39288768b57] master: Revert "Outliner: only activate outliner items when clicking on icon/text"

Campbell Barton noreply at git.blender.org
Fri Aug 16 17:26:33 CEST 2019


Commit: 39288768b5740fa621a1355334ffa878bfaa33b0
Author: Campbell Barton
Date:   Sat Aug 17 01:25:06 2019 +1000
Branches: master
https://developer.blender.org/rB39288768b5740fa621a1355334ffa878bfaa33b0

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.

===================================================================

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 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;
   }



More information about the Bf-blender-cvs mailing list