[Bf-blender-cvs] [cd0e42c0654] soc-2019-outliner: Outliner: Rename tree element flag

[Nathan Craddock]

Commit: cd0e42c0654429bbfe833ee1172c2ed3723cf7d1
Author: Nathan Craddock
Date:   Thu Jul 18 22:15:58 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBcd0e42c0654429bbfe833ee1172c2ed3723cf7d1

Outliner: Rename tree element flag

Renamed from MULTI to MERGED now that I see the real name in the
code

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

M	source/blender/editors/space_outliner/outliner_draw.c
M	source/blender/editors/space_outliner/outliner_intern.h
M	source/blender/editors/space_outliner/outliner_select.c

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 7dcc4ddd9f5..f6dd6f0a84e 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2760,14 +2760,14 @@ static void outliner_draw_iconrow_doit(uiBlock *block,
   if (tselem->flag & TSE_HIGHLIGHTED) {
     alpha_fac += 0.5;
   }
-  tselem_draw_icon(block, xmax, (float)*offsx, (float)ys, tselem, te, alpha_fac, true);
+  tselem_draw_icon(block, xmax, (float)*offsx, (float)ys, tselem, te, alpha_fac, false);
   te->xs = *offsx;
   te->ys = ys;
   te->xend = (short)*offsx + UI_UNIT_X;
 
   if (num_elements > 1) {
     outliner_draw_iconrow_number(fstyle, *offsx, ys, num_elements);
-    te->flag |= TE_ICONROW_MULTI;
+    te->flag |= TE_ICONROW_MERGED;
   }
   else {
     te->flag |= TE_ICONROW;
@@ -2912,7 +2912,7 @@ static void outliner_set_coord_tree_element(TreeElement *te, int startx, int sta
   TreeElement *ten;
 
   /* closed items may be displayed in row of parent, don't change their coordinate! */
-  if (!ELEM(te->flag, TE_ICONROW, TE_ICONROW_MULTI)) {
+  if (!ELEM(te->flag, TE_ICONROW, TE_ICONROW_MERGED)) {
     /* store coord and continue, we need coordinatesfor elements outside view too */
     te->xs = startx;
     te->ys = starty;
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 1f3541379b4..f6f442dbecb 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -139,7 +139,7 @@ enum {
   TE_DISABLED = (1 << 4),
   TE_DRAGGING = (1 << 5),
   TE_CHILD_NOT_IN_COLLECTION = (1 << 6),
-  TE_ICONROW_MULTI = (1 << 7),
+  TE_ICONROW_MERGED = (1 << 7),
 };
 
 /* button events */
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index fe35c8d9661..1829a5da99b 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -1344,7 +1344,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 ((te->flag & TE_ICONROW) == 0) && (view_co_x > te->xs) &&
+  return (!ELEM(te->flag, TE_ICONROW, TE_ICONROW_MERGED)) && (view_co_x > te->xs) &&
          (view_co_x < te->xs + UI_UNIT_X);
 }