[Bf-blender-cvs] [98fc7f6b53c] blender2.8: Remove unused screen-name storage in window

[Julian Eisel]

Commit: 98fc7f6b53c652b3d45e76aa8eb91a6335945923
Author: Julian Eisel
Date:   Thu Nov 9 05:51:42 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB98fc7f6b53c652b3d45e76aa8eb91a6335945923

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).

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

M	source/blender/blenloader/intern/writefile.c
M	source/blender/makesdna/DNA_windowmanager_types.h
M	source/blender/windowmanager/intern/wm.c
M	source/blender/windowmanager/intern/wm_files.c
M	source/blender/windowmanager/intern/wm_window.c

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

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 2ad996f197d..35bb65edb24 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -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);
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 81513f30217..0c49d9c90e5 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -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 */
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index dbc189c6c40..b66bddfa6bf 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -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;
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 20811e8f3bf..07104e034fb 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -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;
 		}
 	}
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index bc40c4c674d..0e07b66996d 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -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;