Commit: 69d829f4acb579effcf204c47c1c894d73f15fd7
Author: Julian Eisel
Date: Mon Mar 6 18:39:00 2017 +0100
Branches: temp-workspace-multi-window
https://developer.blender.org/rB69d829f4acb579effcf204c47c1c894d73f15fd7
Cleanup: Style, remove unused function, use wrapper struct for arguments
===================================================================
M source/blender/blenkernel/BKE_screen.h
M source/blender/blenkernel/BKE_workspace.h
M source/blender/blenkernel/intern/screen.c
M source/blender/blenkernel/intern/workspace.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/workspace/screen_edit.c
M source/blender/editors/workspace/screen_ops.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_screen.h
b/source/blender/blenkernel/BKE_screen.h
index 65f2aa8462..3857a495d5 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -41,6 +41,7 @@ struct Menu;
struct Panel;
struct Scene;
struct ScrArea;
+struct ScreenLayoutData;
struct SpaceType;
struct TransformOrientation;
struct View3D;
@@ -321,8 +322,8 @@ float BKE_screen_view3d_zoom_from_fac(float zoomfac);
/* screen */
void BKE_screen_free(struct bScreen *sc);
-struct bScreen *BKE_screen_create_from_screen_data(
- struct Main *bmain, const ListBase *vertbase, const ListBase
*areabase, const char *name) ATTR_NONNULL();
+struct bScreen *BKE_screen_create_from_layout_data(
+ struct Main *bmain, const struct ScreenLayoutData *layout_data, const
char *name) ATTR_NONNULL();
struct ScrVert *BKE_screen_add_vert(struct bScreen *sc, short x, short y);
unsigned int BKE_screen_visible_layers(struct bScreen *screen, struct Scene
*scene);
diff --git a/source/blender/blenkernel/BKE_workspace.h
b/source/blender/blenkernel/BKE_workspace.h
index e6e416320a..99c072a026 100644
--- a/source/blender/blenkernel/BKE_workspace.h
+++ b/source/blender/blenkernel/BKE_workspace.h
@@ -129,7 +129,6 @@ struct ListBase *BKE_workspace_layout_types_get(WorkSpace
*workspace) GETTER_ATT
const char *BKE_workspace_layout_type_name_get(const WorkSpaceLayoutType
*layout_type) GETTER_ATTRS;
struct ScreenLayoutData
BKE_workspace_layout_type_blueprint_get(WorkSpaceLayoutType *type) GETTER_ATTRS;
struct ListBase *BKE_workspace_layout_type_vertbase_get(WorkSpaceLayoutType
*type) GETTER_ATTRS;
-struct ListBase *BKE_workspace_layout_type_areabase_get(WorkSpaceLayoutType
*type) GETTER_ATTRS;
WorkSpaceLayoutType *BKE_workspace_layout_type_next_get(WorkSpaceLayoutType
*layout_type) GETTER_ATTRS;
WorkSpaceLayout *BKE_workspace_new_layout_get(const WorkSpace *workspace)
GETTER_ATTRS;
void BKE_workspace_new_layout_set(WorkSpace *workspace,
WorkSpaceLayout *layout) SETTER_ATTRS;
diff --git a/source/blender/blenkernel/intern/screen.c
b/source/blender/blenkernel/intern/screen.c
index 145bc334bd..070479df5b 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -439,17 +439,17 @@ void BKE_screen_free(bScreen *sc)
BKE_previewimg_free(&sc->preview);
}
-bScreen *BKE_screen_create_from_screen_data(
- struct Main *bmain, const ListBase *vertbase, const ListBase
*areabase, const char *name)
+bScreen *BKE_screen_create_from_layout_data(
+ struct Main *bmain, const ScreenLayoutData *layout_data, const char
*name)
{
bScreen *screen = BKE_libblock_alloc(bmain, ID_SCR, name);
- for (ScrVert *sv = vertbase->first; sv; sv = sv->next) {
+ for (ScrVert *sv = layout_data->vertbase.first; sv; sv = sv->next) {
ScrVert *sv_new = MEM_callocN(sizeof(ScrVert),
"workspace_change_add_screenvert");
*sv_new = *sv;
BLI_addtail(&screen->vertbase, sv_new);
}
- for (ScrArea *sa = areabase->first; sa; sa = sa->next) {
+ for (ScrArea *sa = layout_data->areabase.first; sa; sa = sa->next) {
ScrArea *sa_new = MEM_callocN(sizeof(ScrArea),
"workspace_change_add_screenarea");
sa_new->v1 = BKE_screen_add_vert(screen, sa->v1->vec.x,
sa->v1->vec.y);
diff --git a/source/blender/blenkernel/intern/workspace.c
b/source/blender/blenkernel/intern/workspace.c
index 12714217db..d0f4d21975 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -156,8 +156,10 @@ void BKE_workspace_hook_delete(Main *bmain, WorkSpaceHook
*hook)
void BKE_workspace_change_prepare(Main *bmain, WorkSpaceHook *workspace_hook,
WorkSpace *workspace_new)
{
for (WorkSpaceLayoutType *type = workspace_new->layout_types.first;
type; type = type->next) {
- bScreen *screen = BKE_screen_create_from_screen_data(bmain,
&type->layout_blueprint.vertbase,
-
&type->layout_blueprint.areabase, type->name);
+ bScreen *screen = BKE_screen_create_from_layout_data(bmain,
&(const ScreenLayoutData) {
+
.vertbase = type->layout_blueprint.vertbase,
+
.areabase = type->layout_blueprint.areabase},
+
type->name);
WorkSpaceLayout *layout =
BKE_workspace_layout_add_from_type(workspace_new, type, screen);
BLI_addtail(&workspace_hook->layouts, layout);
@@ -354,10 +356,6 @@ ListBase
*BKE_workspace_layout_type_vertbase_get(WorkSpaceLayoutType *type)
{
return &type->layout_blueprint.vertbase;
}
-ListBase *BKE_workspace_layout_type_areabase_get(WorkSpaceLayoutType *type)
-{
- return &type->layout_blueprint.areabase;
-}
WorkSpaceLayoutType *BKE_workspace_layout_type_next_get(WorkSpaceLayoutType
*layout_type)
{
diff --git a/source/blender/blenloader/intern/versioning_280.c
b/source/blender/blenloader/intern/versioning_280.c
index b7f86dba2b..6138473c52 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -64,7 +64,7 @@ static void do_version_workspaces_before_lib_link(Main *main)
for (bScreen *screen = main->screen.first; screen; screen =
screen->id.next) {
WorkSpace *ws = BKE_workspace_add(main, screen->id.name + 2);
- WorkSpaceLayoutType *layout_type =
BKE_workspace_layout_type_add(ws, screen->id.name + 2, (ScreenLayoutData){
+ WorkSpaceLayoutType *layout_type =
BKE_workspace_layout_type_add(ws, screen->id.name + 2, (ScreenLayoutData) {
.vertbase = screen->vertbase,
.areabase = screen->areabase});
diff --git a/source/blender/editors/workspace/screen_edit.c
b/source/blender/editors/workspace/screen_edit.c
index c4d33e9ca5..7647901767 100644
--- a/source/blender/editors/workspace/screen_edit.c
+++ b/source/blender/editors/workspace/screen_edit.c
@@ -1542,7 +1542,7 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow
*win, ScrArea *sa, const s
oldscreen->state = state;
BLI_snprintf(newname, sizeof(newname), "%s-%s",
oldscreen->id.name + 2, "nonnormal");
- ED_workspace_layout_add(workspace, &wm->windows, newname,
(ScreenLayoutData){
+ ED_workspace_layout_add(workspace, &wm->windows, newname,
(ScreenLayoutData) {
.vertbase = oldscreen->vertbase,
.areabase = oldscreen->areabase});
layout_new = BKE_workspace_active_layout_get(workspace);
diff --git a/source/blender/editors/workspace/screen_ops.c
b/source/blender/editors/workspace/screen_ops.c
index 03a4db1aef..80257f816c 100644
--- a/source/blender/editors/workspace/screen_ops.c
+++ b/source/blender/editors/workspace/screen_ops.c
@@ -1025,7 +1025,7 @@ static int area_dupli_invoke(bContext *C, wmOperator *op,
const wmEvent *event)
WM_window_set_active_workspace(newwin, workspace_new);
/* allocs new screen and adds to newly created window, using window
size */
- ED_workspace_layout_add(workspace_new, &wm->windows, sc->id.name + 2,
(ScreenLayoutData){
+ ED_workspace_layout_add(workspace_new, &wm->windows, sc->id.name + 2,
(ScreenLayoutData) {
.vertbase = sc->vertbase, .areabase =
sc->areabase});
layout_new = BKE_workspace_active_layout_get(workspace_new);
newsc = BKE_workspace_layout_screen_get(layout_new);
diff --git a/source/blender/windowmanager/intern/wm_window.c
b/source/blender/windowmanager/intern/wm_window.c
index 9239f94691..88671a4743 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -682,7 +682,7 @@ wmWindow *WM_window_open_temp(bContext *C, const rcti
*rect_init, int type)
ListBase vertbase = {}, areabase = {};
ED_screen_empty_data_create(win->sizex, win->sizey, &vertbase,
&areabase);
- ED_workspace_layout_add(workspace, &wm->windows, "temp",
(ScreenLayoutData){
+ ED_workspace_layout_add(workspace, &wm->windows, "temp",
(ScreenLayoutData) {
.vertbase = vertbase, .areabase =
areabase});
layout = BKE_workspace_active_layout_get(workspace);
screen = BKE_workspace_layout_screen_get(layout);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
