[Bf-blender-cvs] [b7607949f78] workspaces: Use iterator for for do_version_workspaces_after_lib_link

[Campbell Barton]

Commit: b7607949f7814fea733048eb36bc26ce132c8fce
Author: Campbell Barton
Date:   Tue May 2 09:16:50 2017 +1000
Branches: workspaces
https://developer.blender.org/rBb7607949f7814fea733048eb36bc26ce132c8fce

Use iterator for for do_version_workspaces_after_lib_link

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

M	source/blender/blenkernel/BKE_workspace.h
M	source/blender/blenloader/intern/versioning_280.c

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

diff --git a/source/blender/blenkernel/BKE_workspace.h b/source/blender/blenkernel/BKE_workspace.h
index 4e13bdfeeb2..9ab7944470e 100644
--- a/source/blender/blenkernel/BKE_workspace.h
+++ b/source/blender/blenkernel/BKE_workspace.h
@@ -87,7 +87,7 @@ WorkSpaceLayout *BKE_workspace_layout_find(
 	for (WorkSpaceLayout *_layout = _start_layout, *_layout##_next; _layout; _layout = _layout##_next) { \
 		_layout##_next = BKE_workspace_layout_next_get(_layout); /* support removing layout from list */
 #define BKE_WORKSPACE_LAYOUT_ITER_BACKWARD_BEGIN(_layout, _start_layout) \
-	for (WorkSpaceLayout *_layout = _start_layout, *_layout##_prev; _layout; _layout = _layout##_prev) {\
+	for (WorkSpaceLayout *_layout = _start_layout, *_layout##_prev; _layout; _layout = _layout##_prev) { \
 		_layout##_prev = BKE_workspace_layout_prev_get(_layout); /* support removing layout from list */
 #define BKE_WORKSPACE_LAYOUT_ITER_END } ((void)0)
 
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 385f15b7cd9..2a65fbd48c3 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -143,16 +143,12 @@ static void do_version_workspaces_after_lib_link(Main *bmain)
 
 	/* Cleanup workspaces from temp screens */
 	if (has_temp_workspaces) {
-		for (ID *workspace = bmain->workspaces.first, *workspace_next;
-		     workspace;
-		     workspace = workspace_next)
-		{
-			workspace_next = workspace->next;
+		BKE_WORKSPACE_ITER_BEGIN (workspace, bmain->workspaces.first) {
 			ListBase *layouts = BKE_workspace_layouts_get((WorkSpace *)workspace);
 			if (BLI_listbase_is_empty(layouts)) {
 				BKE_workspace_remove(bmain, (WorkSpace *)workspace);
 			}
-		}
+		} BKE_WORKSPACE_ITER_END;
 	}
 }