[Bf-blender-cvs] [e1af790d2df] soc-2019-outliner: Outliner cleanup: Disclosure triangle coordinate check

Nathan Craddock noreply at git.blender.org
Wed Jul 24 04:00:25 CEST 2019


Commit: e1af790d2dffe0b096ffe967280e4e1499ca4fa1
Author: Nathan Craddock
Date:   Tue Jul 23 19:47:54 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBe1af790d2dffe0b096ffe967280e4e1499ca4fa1

Outliner cleanup: Disclosure triangle coordinate check

This shouldn't need to check if the element is am iconrow element
because no iconrow elements are found until the call to
`outliner_find_item_at_x_in_row`.

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

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 f53641540b4..6b4d02b38c3 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -1347,8 +1347,7 @@ static void outliner_item_toggle_closed(TreeElement *te, const bool toggle_child
 
 static bool outliner_item_is_co_within_close_toggle(TreeElement *te, float view_co_x)
 {
-  return (!ELEM(te->flag, TE_ICONROW, TE_ICONROW_MERGED)) && (view_co_x > te->xs) &&
-         (view_co_x < te->xs + UI_UNIT_X);
+  return (view_co_x > te->xs) && (view_co_x < te->xs + UI_UNIT_X);
 }
 
 static bool outliner_is_co_within_restrict_columns(const SpaceOutliner *soops,



More information about the Bf-blender-cvs mailing list