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

Revert "Cleanup: Use LISTBASE_FOREACH in editors screen directory"

Browse Source 
This reverts commit 52f40bcff2.

Apologies for the noise. I caught a problem with this that I hadn't before. I will
commit later after thorough testing.
This commit is contained in:
Hans Goudey
2020-08-20 09:34:09 -04:00
parent 52f40bcff2
commit f9697543e4
8 changed files with 127 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,7 +409,8 @@ static void workspace_add_menu(bContext *UNUSED(C), uiLayout *layout, void *temp
WorkspaceConfigFileData *builtin_config = workspace_system_file_read(app_template);
if (startup_config) {
LISTBASE_FOREACH (WorkSpace *, workspace, &startup_config->workspaces) {
for (WorkSpace *workspace = startup_config->workspaces.first; workspace;
workspace = workspace->id.next) {
uiLayout *row = uiLayoutRow(layout, false);
workspace_append_button(row, ot_append, workspace, startup_config->main);
has_startup_items = true;
@@ -419,7 +420,8 @@ static void workspace_add_menu(bContext *UNUSED(C), uiLayout *layout, void *temp
if (builtin_config) {
bool has_title = false;
LISTBASE_FOREACH (WorkSpace *, workspace, &startup_config->workspaces) {
for (WorkSpace *workspace = builtin_config->workspaces.first; workspace;
workspace = workspace->id.next) {
if (startup_config &&
BLI_findstring(&startup_config->workspaces, workspace->id.name, offsetof(ID, name))) {
continue;