diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-05 00:26:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-06 14:21:41 +0300 |
| commit | 6081f6c3870718660e984da3fbfcd44c55abcc20 (patch) | |
| tree | afe56aefccd7d13a72277c816861bbd6478d931c /source/blender/windowmanager/intern/wm_files.c | |
| parent | e602fe60c042c7ff0a1ebbe2deab3b347f4ccc86 (diff) | |
Fix T47204: selection failing directly after disabling multisample in user prefs.
Now store the multisample setting each window was created with.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index e3172de626a..3e2976bb8e0 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -182,6 +182,7 @@ static void wm_window_match_init(bContext *C, ListBase *wmlist) static void wm_window_substitute_old(wmWindowManager *wm, wmWindow *oldwin, wmWindow *win) { win->ghostwin = oldwin->ghostwin; + win->multisamples = oldwin->multisamples; win->active = oldwin->active; if (win->active) wm->winactive = win; @@ -190,6 +191,7 @@ static void wm_window_substitute_old(wmWindowManager *wm, wmWindow *oldwin, wmWi GHOST_SetWindowUserData(win->ghostwin, win); /* pointer back */ oldwin->ghostwin = NULL; + oldwin->multisamples = 0; win->eventstate = oldwin->eventstate; oldwin->eventstate = NULL; |