archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T61808: remove confusing graying out of workspace that already exist

Browse Source 
This was meant to help users see which users are likely useful to add, but
it's not so obvious and there are cases where it's useful to re-append the
same workspace.
This commit is contained in:
Brecht Van Lommel
2019-07-03 20:41:54 +02:00
parent 0a3e73a91f
commit b8ed75ab6d
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/screen/workspace_edit.c
View File

@@ -434,9 +434,8 @@ static void workspace_append_button(uiLayout *layout,
RNA_string_set(&opptr, "filepath", filepath);
}
static void workspace_add_menu(bContext *C, uiLayout *layout, void *template_v)
static void workspace_add_menu(bContext *UNUSED(C), uiLayout *layout, void *template_v)
{
Main *bmain = CTX_data_main(C);
const char *app_template = template_v;
bool has_startup_items = false;
@@ -448,10 +447,6 @@ static void workspace_add_menu(bContext *C, uiLayout *layout, void *template_v)
for (WorkSpace *workspace = startup_config->workspaces.first; workspace;
workspace = workspace->id.next) {
uiLayout *row = uiLayoutRow(layout, false);
if (BLI_findstring(&bmain->workspaces, workspace->id.name, offsetof(ID, name))) {
uiLayoutSetActive(row, false);
}
workspace_append_button(row, ot_append, workspace, startup_config->main);
has_startup_items = true;
}
@@ -475,10 +470,6 @@ static void workspace_add_menu(bContext *C, uiLayout *layout, void *template_v)
}
uiLayout *row = uiLayoutRow(layout, false);
if (BLI_findstring(&bmain->workspaces, workspace->id.name, offsetof(ID, name))) {
uiLayoutSetActive(row, false);
}
workspace_append_button(row, ot_append, workspace, builtin_config->main);
}
}