[Bf-blender-cvs] [096cd76aa23] soc-2020-outliner: Outliner: Use proper icon for fake users

[Nathan Craddock]

Commit: 096cd76aa230f5a1da8c56291760f3354f861032
Author: Nathan Craddock
Date:   Fri Jun 19 20:13:50 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB096cd76aa230f5a1da8c56291760f3354f861032

Outliner: Use proper icon for fake users

In orphan data display mode, the QUIT and X icons were used to show the
state of fake users. This uses the proper icons, and removes the "F"
column now that we have a proper icon to show the fake user status.

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

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

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 958d5ee8a70..d46ba683de7 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1657,7 +1657,6 @@ static void outliner_draw_userbuts(uiBlock *block,
         uiBut *bt;
         ID *id = tselem->id;
         const char *tip = NULL;
-        int icon = ICON_NONE;
         char buf[16] = "";
         int but_flag = UI_BUT_DRAG_LOCK;
 
@@ -1683,18 +1682,16 @@ static void outliner_draw_userbuts(uiBlock *block,
         UI_but_flag_enable(bt, but_flag);
 
         if (id->flag & LIB_FAKEUSER) {
-          icon = ICON_FILE_TICK;
           tip = TIP_("Data-block will be retained using a fake user");
         }
         else {
-          icon = ICON_X;
           tip = TIP_("Data-block has no users and will be deleted");
         }
         bt = uiDefIconButBitS(block,
                               UI_BTYPE_ICON_TOGGLE,
                               LIB_FAKEUSER,
                               1,
-                              icon,
+                              ICON_FAKE_USER_OFF,
                               (int)(region->v2d.cur.xmax - OL_TOG_USER_BUTS_STATUS),
                               te->ys,
                               UI_UNIT_X,
@@ -1707,25 +1704,6 @@ static void outliner_draw_userbuts(uiBlock *block,
                               tip);
         UI_but_func_set(bt, restrictbutton_id_user_toggle, id, NULL);
         UI_but_flag_enable(bt, but_flag);
-
-        bt = uiDefButBitS(block,
-                          UI_BTYPE_ICON_TOGGLE,
-                          LIB_FAKEUSER,
-                          1,
-                          (id->flag & LIB_FAKEUSER) ? "F" : " ",
-                          (int)(region->v2d.cur.xmax - OL_TOG_USER_BUTS_FAKEUSER),
-                          te->ys,
-                          UI_UNIT_X,
-                          UI_UNIT_Y,
-                          &id->flag,
-                          0,
-                          0,
-                          0,
-                          0,
-                          TIP_("Data-block has a 'fake' user which will keep it in the file "
-                               "even if nothing else uses it"));
-        UI_but_func_set(bt, restrictbutton_id_user_toggle, id, NULL);
-        UI_but_flag_enable(bt, but_flag);
       }
     }
 
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index dcc5fbb8671..9911628a651 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -162,9 +162,8 @@ typedef enum {
 /* size constants */
 #define OL_Y_OFFSET 2
 
-#define OL_TOG_USER_BUTS_USERS (UI_UNIT_X * 2.0f + V2D_SCROLL_WIDTH)
-#define OL_TOG_USER_BUTS_STATUS (UI_UNIT_X * 3.0f + V2D_SCROLL_WIDTH)
-#define OL_TOG_USER_BUTS_FAKEUSER (UI_UNIT_X + V2D_SCROLL_WIDTH)
+#define OL_TOG_USER_BUTS_USERS (UI_UNIT_X + V2D_SCROLL_WIDTH)
+#define OL_TOG_USER_BUTS_STATUS (UI_UNIT_X * 2.0f + V2D_SCROLL_WIDTH)
 
 #define OL_RNA_COLX (UI_UNIT_X * 15)
 #define OL_RNA_COL_SIZEX (UI_UNIT_X * 7.5f)