diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2020-06-22 18:34:50 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-06-22 18:41:54 +0300 |
commit | fdfe85c616d2d43c171bfd120c809e530e18dc35 (patch) | |
tree | df0a5cf772c0a005669d258f3d176feabec1533c /source/blender/editors/space_outliner | |
parent | bfaa41c00d6f53c847f447c7c62cd81efbd9f5d8 (diff) |
Fix: Wrong fake user icons in outliner orphan mode
The icons for toggling fake users on orphan datablocks in the outliner
were drawn as the quit and x icons instead of the fake user icon. This
changes to the correct icon, and removes the redundant "F" column.
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 24 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 3 |
2 files changed, 2 insertions, 25 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index dd16e21c747..93c7a4f4ed4 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 d691da6d11a..b590eb75407 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -163,8 +163,7 @@ typedef enum { #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_STATUS (UI_UNIT_X + V2D_SCROLL_WIDTH) #define OL_RNA_COLX (UI_UNIT_X * 15) #define OL_RNA_COL_SIZEX (UI_UNIT_X * 7.5f) |