[Bf-blender-cvs] [d3e1782abc3] master: Fix T66530: set_stereo_3d (pageflip) exists Blender
Dalai Felinto
noreply at git.blender.org
Wed Jul 10 14:12:21 CEST 2019
Commit: d3e1782abc3be15fdc45e5139ebe1e9638d52734
Author: Dalai Felinto
Date: Tue Jul 9 15:50:45 2019 -0300
Branches: master
https://developer.blender.org/rBd3e1782abc3be15fdc45e5139ebe1e9638d52734
Fix T66530: set_stereo_3d (pageflip) exists Blender
Note: Although this fixes the issue (as in, it prevents a crash)
BKE_reports are not working because of CTX_wm_window_set().
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D5210
===================================================================
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index daa501f55b4..d17b8817691 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -714,8 +714,14 @@ void wm_window_ghostwindows_ensure(wmWindowManager *wm)
wm_window_ghostwindow_add(wm, "Blender", win);
}
- /* happens after fileread */
- wm_window_ensure_eventstate(win);
+
+ if (win->ghostwin != NULL) {
+ /* If we have no ghostwin this is a buggy window that should be removed.
+ * However we still need to initialize it correctly so the screen doesn't hang. */
+
+ /* happens after fileread */
+ wm_window_ensure_eventstate(win);
+ }
/* add keymap handlers (1 handler for all keys in map!) */
keymap = WM_keymap_ensure(wm->defaultconf, "Window", 0, 0);
More information about the Bf-blender-cvs
mailing list