[Bf-blender-cvs] [d9d769732d6] workspaces: Use uppercase for macros
Campbell Barton
noreply at git.blender.org
Tue May 2 00:55:39 CEST 2017
Commit: d9d769732d6cc9642221b63da881ae7a6207c3e2
Author: Campbell Barton
Date: Tue May 2 09:00:58 2017 +1000
Branches: workspaces
https://developer.blender.org/rBd9d769732d6cc9642221b63da881ae7a6207c3e2
Use uppercase for macros
===================================================================
M source/blender/blenkernel/BKE_workspace.h
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/workspace.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/editors/screen/workspace_edit.c
M source/blender/editors/screen/workspace_layout_edit.c
M source/blender/makesrna/intern/rna_screen.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_workspace.h b/source/blender/blenkernel/BKE_workspace.h
index fc5c2f23ddc..4e13bdfeeb2 100644
--- a/source/blender/blenkernel/BKE_workspace.h
+++ b/source/blender/blenkernel/BKE_workspace.h
@@ -71,10 +71,10 @@ void BKE_workspace_layouts_transfer(
/* -------------------------------------------------------------------- */
/* General Utils */
-#define BKE_workspace_iter_begin(_workspace, _start_workspace) \
+#define BKE_WORKSPACE_ITER_BEGIN(_workspace, _start_workspace) \
for (WorkSpace *_workspace = _start_workspace, *_workspace##_next; _workspace; _workspace = _workspace##_next) { \
_workspace##_next = BKE_workspace_next_get(_workspace); /* support removing workspace from list */
-#define BKE_workspace_iter_end } (void)0
+#define BKE_WORKSPACE_ITER_END } ((void)0)
void BKE_workspaces_transform_orientation_remove(
const struct ListBase *workspaces,
@@ -83,13 +83,13 @@ void BKE_workspaces_transform_orientation_remove(
WorkSpaceLayout *BKE_workspace_layout_find(
const WorkSpace *workspace, const struct bScreen *screen) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT;
-#define BKE_workspace_layout_iter_begin(_layout, _start_layout) \
+#define BKE_WORKSPACE_LAYOUT_ITER_BEGIN(_layout, _start_layout) \
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_backwards_begin(_layout, _start_layout) \
+#define BKE_WORKSPACE_LAYOUT_ITER_BACKWARD_BEGIN(_layout, _start_layout) \
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
+#define BKE_WORKSPACE_LAYOUT_ITER_END } ((void)0)
WorkSpaceLayout *BKE_workspace_layout_iter_circular(
const WorkSpace *workspace, WorkSpaceLayout *start,
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index bac41d53334..413eba494db 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -539,12 +539,10 @@ bool BKE_blendfile_workspace_config_write(Main *bmain, const char *filepath, Rep
BKE_blendfile_write_partial_begin(bmain);
- BKE_workspace_iter_begin(workspace, bmain->workspaces.first)
- {
+ BKE_WORKSPACE_ITER_BEGIN (workspace, bmain->workspaces.first) {
ID *workspace_id = BKE_workspace_id_get(workspace);
BKE_blendfile_write_partial_tag_ID(workspace_id, true);
- }
- BKE_workspace_iter_end;
+ } BKE_WORKSPACE_ITER_END;
if (BKE_blendfile_write_partial(bmain, filepath, fileflags, reports)) {
retval = true;
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index a08bfbd5d26..041c0f0dcf1 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -1008,15 +1008,13 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
WorkSpace *workspace = (WorkSpace *)id;
ListBase *layouts = BKE_workspace_layouts_get(workspace);
- BKE_workspace_layout_iter_begin(layout, layouts->first);
- {
+ BKE_WORKSPACE_LAYOUT_ITER_BEGIN (layout, layouts->first) {
bScreen *screen = BKE_workspace_layout_screen_get(layout);
CALLBACK_INVOKE(screen, IDWALK_CB_NOP);
/* allow callback to set a different screen */
BKE_workspace_layout_screen_set(layout, screen);
- }
- BKE_workspace_layout_iter_end;
+ } BKE_WORKSPACE_LAYOUT_ITER_END;
break;
}
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index ed710c3f19a..93b9507d60a 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -163,11 +163,9 @@ void BKE_workspace_free(WorkSpace *workspace)
void BKE_workspace_remove(Main *bmain, WorkSpace *workspace)
{
- BKE_workspace_layout_iter_begin(layout, workspace->layouts.first)
- {
+ BKE_WORKSPACE_LAYOUT_ITER_BEGIN (layout, workspace->layouts.first) {
BKE_workspace_layout_remove(bmain, workspace, layout);
- }
- BKE_workspace_layout_iter_end;
+ } BKE_WORKSPACE_LAYOUT_ITER_END;
BKE_libblock_free(bmain, workspace);
}
@@ -177,11 +175,9 @@ WorkSpaceInstanceHook *BKE_workspace_instance_hook_create(const Main *bmain)
WorkSpaceInstanceHook *hook = MEM_callocN(sizeof(WorkSpaceInstanceHook), __func__);
/* set an active screen-layout for each possible window/workspace combination */
- BKE_workspace_iter_begin(workspace_iter, bmain->workspaces.first)
- {
+ BKE_WORKSPACE_ITER_BEGIN (workspace_iter, bmain->workspaces.first) {
BKE_workspace_hook_layout_for_workspace_set(hook, workspace_iter, workspace_iter->layouts.first);
- }
- BKE_workspace_iter_end;
+ } BKE_WORKSPACE_ITER_END;
return hook;
}
@@ -191,8 +187,7 @@ void BKE_workspace_instance_hook_free(const Main *bmain, WorkSpaceInstanceHook *
BLI_assert(!BLI_listbase_is_empty(&bmain->workspaces));
/* Free relations for this hook */
- BKE_workspace_iter_begin(workspace, bmain->workspaces.first)
- {
+ BKE_WORKSPACE_ITER_BEGIN (workspace, bmain->workspaces.first) {
for (WorkSpaceDataRelation *relation = workspace->hook_layout_relations.first, *relation_next;
relation;
relation = relation_next)
@@ -202,8 +197,7 @@ void BKE_workspace_instance_hook_free(const Main *bmain, WorkSpaceInstanceHook *
workspace_relation_remove(&workspace->hook_layout_relations, relation);
}
}
- }
- BKE_workspace_iter_end;
+ } BKE_WORKSPACE_ITER_END;
MEM_freeN(hook);
}
@@ -247,15 +241,11 @@ void BKE_workspace_layouts_transfer(
void BKE_workspaces_transform_orientation_remove(
const ListBase *workspaces, const TransformOrientation *orientation)
{
- BKE_workspace_iter_begin(workspace, workspaces->first)
- {
- BKE_workspace_layout_iter_begin(layout, workspace->layouts.first)
- {
+ BKE_WORKSPACE_ITER_BEGIN (workspace, workspaces->first) {
+ BKE_WORKSPACE_LAYOUT_ITER_BEGIN (layout, workspace->layouts.first) {
BKE_screen_transform_orientation_remove(BKE_workspace_layout_screen_get(layout), orientation);
- }
- BKE_workspace_layout_iter_end;
- }
- BKE_workspace_iter_end;
+ } BKE_WORKSPACE_LAYOUT_ITER_END;
+ } BKE_WORKSPACE_ITER_END;
}
WorkSpaceLayout *BKE_workspace_layout_find(
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index dec70c48aa5..243e0adeb30 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2778,15 +2778,13 @@ static void lib_link_workspaces(FileData *fd, Main *bmain)
/* Note the NULL pointer checks for result of newlibadr. This is needed for reading old files from before the
* introduction of workspaces (in do_versioning code we already created workspaces for screens of old file). */
- BKE_workspace_iter_begin(workspace, bmain->workspaces.first)
- {
+ BKE_WORKSPACE_ITER_BEGIN (workspace, bmain->workspaces.first) {
ID *id = BKE_workspace_id_get(workspace);
ListBase *layouts = BKE_workspace_layouts_get(workspace);
id_us_ensure_real(id);
- BKE_workspace_layout_iter_begin(layout, layouts->first)
- {
+ BKE_WORKSPACE_LAYOUT_ITER_BEGIN (layout, layouts->first) {
bScreen *screen = newlibadr(fd, id->lib, BKE_workspace_layout_screen_get(layout));
if (screen) {
@@ -2800,10 +2798,8 @@ static void lib_link_workspaces(FileData *fd, Main *bmain)
}
}
}
- }
- BKE_workspace_layout_iter_end;
- }
- BKE_workspace_iter_end;
+ } BKE_WORKSPACE_LAYOUT_ITER_END;
+ } BKE_WORKSPACE_ITER_END;
}
static void direct_link_workspace(FileData *fd, WorkSpace *workspace, const Main *main)
@@ -6121,12 +6117,10 @@ static void direct_link_layer_collections(FileData *fd, ListBase *lb)
static void direct_link_scene_update_screen_data(
FileData *fd, const ListBase *workspaces, const ListBase *screens)
{
- BKE_workspace_iter_begin(workspace, workspaces->first)
- {
+ BKE_WORKSPACE_ITER_BEGIN (workspace, workspaces->first) {
SceneLayer *layer = newdataadr(fd, BKE_workspace_render_layer_get(workspace));
BKE_workspace_render_layer_set(workspace, layer);
- }
- BKE_workspace_iter_end;
+ } BKE_WORKSPACE_ITER_END;
for (bScreen *screen = screens->first; screen; screen = screen->id.next) {
for (ScrArea *area = screen->areabase.first; area; area = area->next) {
@@ -7175,18 +7169,14 @@ void blo_lib_link_restore(Main *newmain, wmWindowManager *curwm, Scene *curscene
{
struct IDNameLib_Map *id_map = BKE_main_idmap_create(newmain);
- BKE_workspace_iter_begin(workspace, newmain->workspaces.first)
- {
+ BKE_WORKSPACE_ITER_BEGIN (workspace, newmain->workspaces.first) {
ListBase *layouts = BKE_workspace_layouts_get(workspace);
- BKE_workspace_layout_iter_begin(layout, layouts->first)
- {
+ BKE_WORKSPACE_LAYOUT_ITER_BEGIN (layout, layouts->first) {
lib_link_workspace_layout_restore(id_map, newmain, layout);
- }
- BKE_workspace_layout_iter_end;
+ } BKE_WORKSPACE_LAYOUT_ITER_END;
BKE_workspace_render_layer_set(workspace, cur_render_layer);
- }
- BKE_workspace_iter_end;
+ } BKE_WORKSPACE_ITER_END;
for (wmWindow *win = curwm->windows.first; win; win = win->next) {
WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
@@ -10064,11 +10054,9 @@ static void expand_workspace(FileData *fd, Main *mainvar, WorkSpace *workspace)
{
ListBase *layouts = BKE_workspace_layouts_get(workspace);
- BKE_workspace_layout_iter_begin(layout, layouts->first)
- {
+ BKE_WORKSPACE_LAYOUT_ITER_BEGIN (layout, layouts->first) {
expand_doit(fd, mainvar, BKE_workspace_layout_screen_get(layout));
- }
- BKE_workspace_layout_iter_end;
+ } BKE_WORKSPACE_LAYOUT_ITER_END;
}
/**
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 821722815ec..385f15b7cd9 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list