[Bf-blender-cvs] [4963a413823] workspaces: Use Main as the first argument
Campbell Barton
noreply at git.blender.org
Mon May 1 22:49:04 CEST 2017
Commit: 4963a4138239fa40b92d55d5a702de5564a73867
Author: Campbell Barton
Date: Tue May 2 06:54:27 2017 +1000
Branches: workspaces
https://developer.blender.org/rB4963a4138239fa40b92d55d5a702de5564a73867
Use Main as the first argument
===================================================================
M source/blender/blenkernel/BKE_workspace.h
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/screen_edit.c
M source/blender/editors/screen/workspace_layout_edit.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 abca20ed04e..fc5c2f23ddc 100644
--- a/source/blender/blenkernel/BKE_workspace.h
+++ b/source/blender/blenkernel/BKE_workspace.h
@@ -47,24 +47,23 @@ typedef struct WorkSpaceLayout WorkSpaceLayout;
*/
#define USE_WORKSPACE_MODE
-
/* -------------------------------------------------------------------- */
/* Create, delete, init */
WorkSpace *BKE_workspace_add(struct Main *bmain, const char *name);
void BKE_workspace_free(WorkSpace *workspace);
-void BKE_workspace_remove(WorkSpace *workspace, struct Main *bmain);
+void BKE_workspace_remove(struct Main *bmain, WorkSpace *workspace);
WorkSpaceInstanceHook *BKE_workspace_instance_hook_create(const struct Main *bmain);
-void BKE_workspace_instance_hook_free(WorkSpaceInstanceHook *hook, const struct Main *bmain);
+void BKE_workspace_instance_hook_free(const struct Main *bmain, WorkSpaceInstanceHook *hook);
struct WorkSpaceLayout *BKE_workspace_layout_add(
WorkSpace *workspace,
struct bScreen *screen,
const char *name) ATTR_NONNULL();
void BKE_workspace_layout_remove(
- WorkSpace *workspace, WorkSpaceLayout *layout,
- struct Main *bmain) ATTR_NONNULL();
+ struct Main *bmain,
+ WorkSpace *workspace, WorkSpaceLayout *layout) ATTR_NONNULL();
void BKE_workspace_layouts_transfer(
WorkSpace *workspace_dst, WorkSpace *workspace_src) ATTR_NONNULL();
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index 9faf075af85..f687ab383a0 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -160,11 +160,11 @@ void BKE_workspace_free(WorkSpace *workspace)
BLI_freelistN(&workspace->layouts);
}
-void BKE_workspace_remove(WorkSpace *workspace, Main *bmain)
+void BKE_workspace_remove(Main *bmain, WorkSpace *workspace)
{
BKE_workspace_layout_iter_begin(layout, workspace->layouts.first)
{
- BKE_workspace_layout_remove(workspace, layout, bmain);
+ BKE_workspace_layout_remove(bmain, workspace, layout);
}
BKE_workspace_layout_iter_end;
@@ -184,7 +184,7 @@ WorkSpaceInstanceHook *BKE_workspace_instance_hook_create(const Main *bmain)
return hook;
}
-void BKE_workspace_instance_hook_free(WorkSpaceInstanceHook *hook, const Main *bmain)
+void BKE_workspace_instance_hook_free(const Main *bmain, WorkSpaceInstanceHook *hook)
{
/* workspaces should never be freed before wm (during which we call this function) */
BLI_assert(!BLI_listbase_is_empty(&bmain->workspaces));
@@ -226,8 +226,8 @@ WorkSpaceLayout *BKE_workspace_layout_add(
}
void BKE_workspace_layout_remove(
- WorkSpace *workspace, WorkSpaceLayout *layout,
- Main *bmain)
+ Main *bmain,
+ WorkSpace *workspace, WorkSpaceLayout *layout)
{
BKE_libblock_free(bmain, BKE_workspace_layout_screen_get(layout));
BLI_freelinkN(&workspace->layouts, layout);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5c19011a914..dec70c48aa5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2796,7 +2796,7 @@ static void lib_link_workspaces(FileData *fd, Main *bmain)
screen->winid = 0;
if (screen->temp) {
/* delete temp layouts when appending */
- BKE_workspace_layout_remove(workspace, layout, bmain);
+ BKE_workspace_layout_remove(bmain, workspace, layout);
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index d620b2f1b29..821722815ec 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -150,7 +150,7 @@ static void do_version_workspaces_after_lib_link(Main *bmain)
workspace_next = workspace->next;
ListBase *layouts = BKE_workspace_layouts_get((WorkSpace *)workspace);
if (BLI_listbase_is_empty(layouts)) {
- BKE_workspace_remove((WorkSpace *)workspace, bmain);
+ BKE_workspace_remove(bmain, (WorkSpace *)workspace);
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 66a5a6e6dd4..cbd1e05647c 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -99,7 +99,7 @@ static void update_defaults_startup_workspaces(Main *bmain)
workspace_default = workspace;
}
else {
- BKE_workspace_remove(workspace, bmain);
+ BKE_workspace_remove(bmain, workspace);
}
}
BKE_workspace_iter_end;
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index ca63de31578..0743b108c97 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1498,7 +1498,7 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
ED_screen_change(C, sc);
- BKE_workspace_layout_remove(workspace, layout_old, CTX_data_main(C));
+ BKE_workspace_layout_remove(CTX_data_main(C), workspace, layout_old);
/* After we've restored back to SCREENNORMAL, we have to wait with
* screen handling as it uses the area coords which aren't updated yet.
diff --git a/source/blender/editors/screen/workspace_layout_edit.c b/source/blender/editors/screen/workspace_layout_edit.c
index 987c63f27ac..9a9fd22040e 100644
--- a/source/blender/editors/screen/workspace_layout_edit.c
+++ b/source/blender/editors/screen/workspace_layout_edit.c
@@ -90,7 +90,7 @@ static bool workspace_layout_delete_doit(
ED_screen_change(C, screen_new);
if (BKE_workspace_active_layout_get(win->workspace_hook) != layout_old) {
- BKE_workspace_layout_remove(workspace, layout_old, bmain);
+ BKE_workspace_layout_remove(bmain, workspace, layout_old);
return true;
}
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 3353798f0e2..1acc1fd1e16 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -221,7 +221,7 @@ void wm_window_free(bContext *C, wmWindowManager *wm, wmWindow *win)
wm_ghostwindow_destroy(win);
- BKE_workspace_instance_hook_free(win->workspace_hook, G.main);
+ BKE_workspace_instance_hook_free(G.main, win->workspace_hook);
MEM_freeN(win->stereo3d_format);
MEM_freeN(win);
@@ -383,7 +383,7 @@ void wm_window_close(bContext *C, wmWindowManager *wm, wmWindow *win)
Main *bmain = CTX_data_main(C);
BLI_assert(BKE_workspace_layout_screen_get(layout) == screen);
- BKE_workspace_layout_remove(workspace, layout, bmain);
+ BKE_workspace_layout_remove(bmain, workspace, layout);
}
}
}
More information about the Bf-blender-cvs
mailing list