[Bf-blender-cvs] [7d51351004a] soc-2020-outliner: Outliner: Use dot icons for object not in current interaction mode

[Nathan Craddock]

Commit: 7d51351004a09af54c6f6b51c0ecf6f1940724b9
Author: Nathan Craddock
Date:   Mon Jun 15 16:18:52 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB7d51351004a09af54c6f6b51c0ecf6f1940724b9

Outliner: Use dot icons for object not in current interaction mode

Revert the change that used a faded-out icon of the mode. That was too
cluttered.

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

M	source/blender/editors/space_outliner/outliner_draw.c

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 8f7afe64dcf..574d22aba30 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2063,21 +2063,20 @@ static void outliner_draw_left_column_mode_toggle(uiBlock *block,
 
     if (ob->type == tvc->obact->type) {
       if (ob->mode == tvc->obact->mode) {
-        but = uiDefIconBut(
-            block,
-            UI_BTYPE_ICON_TOGGLE,
-            0,
-            (ob->mode == tvc->obact->mode ? outliner_get_mode_icon(active_mode) : ICON_DOT),
-            0,
-            te->ys,
-            UI_UNIT_X,
-            UI_UNIT_Y,
-            NULL,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            TIP_("Remove from the current mode"));
+        but = uiDefIconBut(block,
+                           UI_BTYPE_ICON_TOGGLE,
+                           0,
+                           outliner_get_mode_icon(active_mode),
+                           0,
+                           te->ys,
+                           UI_UNIT_X,
+                           UI_UNIT_Y,
+                           NULL,
+                           0.0,
+                           0.0,
+                           0.0,
+                           0.0,
+                           TIP_("Remove from the current mode"));
         UI_but_func_set(but, outliner_mode_toggle_fn, tselem, NULL);
       }
       else {
@@ -2085,21 +2084,20 @@ static void outliner_draw_left_column_mode_toggle(uiBlock *block,
         if (active_mode == OB_MODE_PARTICLE_EDIT && !ob->particlesystem.first) {
           return;
         }
-        but = uiDefIconBut(
-            block,
-            (tselem->flag & TSE_HIGHLIGHTED ? UI_BTYPE_ICON_TOGGLE : UI_BTYPE_LABEL),
-            0,
-            outliner_get_mode_icon(active_mode),
-            0,
-            te->ys,
-            UI_UNIT_X,
-            UI_UNIT_Y,
-            NULL,
-            0.0,
-            0.0,
-            1.0,
-            0.6,
-            TIP_("Add to the current mode"));
+        but = uiDefIconBut(block,
+                           UI_BTYPE_ICON_TOGGLE,
+                           0,
+                           ICON_DOT,
+                           0,
+                           te->ys,
+                           UI_UNIT_X,
+                           UI_UNIT_Y,
+                           NULL,
+                           0.0,
+                           0.0,
+                           0.0,
+                           0.0,
+                           TIP_("Add to the current mode"));
         UI_but_func_set(but, outliner_mode_toggle_fn, tselem, NULL);
       }
     }