[Bf-blender-cvs] [b10943568b6] workspaces: Fix failing assert on undo

[Julian Eisel]

Commit: b10943568b6165940d78e902bea251319dc4f68c
Author: Julian Eisel
Date:   Sun May 7 01:03:53 2017 +0200
Branches: workspaces
https://developer.blender.org/rBb10943568b6165940d78e902bea251319dc4f68c

Fix failing assert on undo

Caused by rB9fa84d640f151 which set the deprecated pointer for forward
compatibility, leading to failling assertion of this pointer being NULL.
We now NULL the pointer again after writing to file.

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

M	source/blender/blenloader/intern/writefile.c

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

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 06ae773b195..410c5454f53 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2844,6 +2844,9 @@ static void write_windowmanager(WriteData *wd, wmWindowManager *wm)
 		writestruct(wd, DATA, wmWindow, 1, win);
 		writestruct(wd, DATA, WorkSpaceInstanceHook, 1, win->workspace_hook);
 		writestruct(wd, DATA, Stereo3dFormat, 1, win->stereo3d_format);
+
+		/* data is written, clear deprecated data again */
+		win->screen = NULL;
 	}
 }