blender
/
blender
135
403
Fork 585
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Remove unused screen-name storage in window 

Checked in really old revisions, seems like this was never used. So
doesn't matter for compatibility either (tested opening files saved with
this in 2.49).
This commit is contained in:
Julian Eisel 2017-11-09 05:51:42 +01:00
parent fadbb2fde8
commit 98fc7f6b53
5 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenloader/intern/writefile.c
View File

@ -2844,9 +2844,6 @@ static void write_windowmanager(WriteData *wd, wmWindowManager *wm)
/* update deprecated screen member (for so loading in 2.7x uses the correct screen) */
win->screen = BKE_workspace_active_screen_get(win->workspace_hook);
if (win->screen) {
BLI_strncpy(win->screenname, win->screen->id.name + 2, sizeof(win->screenname));
}
writestruct(wd, DATA, wmWindow, 1, win);
writestruct(wd, DATA, WorkSpaceInstanceHook, 1, win->workspace_hook);

1
source/blender/makesdna/DNA_windowmanager_types.h
View File

@ -183,7 +183,6 @@ typedef struct wmWindow {
struct WorkSpaceInstanceHook *workspace_hook;
struct bScreen *screen DNA_DEPRECATED;
char screenname[64]; /* MAX_ID_NAME for matching window with active screen after file read */
short posx, posy, sizex, sizey; /* window coords */
short windowstate; /* borderless, full */

1
source/blender/windowmanager/intern/wm.c
View File

@ -443,7 +443,6 @@ void wm_add_default(Main *bmain, bContext *C)
WM_window_set_active_workspace(win, workspace);
WM_window_set_active_layout(win, workspace, layout);
screen->winid = win->winid;
BLI_strncpy(win->screenname, screen->id.name + 2, sizeof(win->screenname));
wm->winactive = win;
wm->file_saved = 1;

1
source/blender/windowmanager/intern/wm_files.c
View File

@ -235,7 +235,6 @@ static void wm_window_match_keep_current_wm(
}
bScreen *win_screen = WM_window_get_active_screen(win);
BLI_strncpy(win->screenname, win_screen->id.name + 2, sizeof(win->screenname));
win_screen->winid = win->winid;
}
}

3
source/blender/windowmanager/intern/wm_window.c
View File

@ -284,7 +284,6 @@ wmWindow *wm_window_copy(bContext *C, wmWindow *win_src, const bool duplicate_la
WorkSpaceLayout *layout_old = WM_window_get_active_layout(win_src);
Scene *scene = WM_window_get_active_scene(win_src);
WorkSpaceLayout *layout_new;
bScreen *new_screen;
win_dst->posx = win_src->posx + 10;
win_dst->posy = win_src->posy;
@ -295,8 +294,6 @@ wmWindow *wm_window_copy(bContext *C, wmWindow *win_src, const bool duplicate_la
WM_window_set_active_workspace(win_dst, workspace);
layout_new = duplicate_layout ? ED_workspace_layout_duplicate(workspace, layout_old, win_dst) : layout_old;
WM_window_set_active_layout(win_dst, workspace, layout_new);
new_screen = WM_window_get_active_screen(win_dst);
BLI_strncpy(win_dst->screenname, new_screen->id.name + 2, sizeof(win_dst->screenname));
win_dst->drawmethod = U.wmdrawmethod;