[Bf-blender-cvs] [0c7bfdf9a50] master: Fix T69467: Temporary Info Editor window crashes

Julian Eisel noreply at git.blender.org
Wed Sep 4 01:49:46 CEST 2019


Commit: 0c7bfdf9a50de0c98e7e9ee55511c842148dae6b
Author: Julian Eisel
Date:   Wed Sep 4 01:47:16 2019 +0200
Branches: master
https://developer.blender.org/rB0c7bfdf9a50de0c98e7e9ee55511c842148dae6b

Fix T69467: Temporary Info Editor window crashes

Code called editor creation twice, once for SPACE_INFO, once for
SPACE_EMPTY. Caused by a incorrectly solved merge conflict.

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

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 00ed203c208..91173804b18 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -901,7 +901,7 @@ wmWindow *WM_window_open_temp(bContext *C, int x, int y, int sizex, int sizey, i
     space_type = SPACE_FILE;
   }
   else if (type == WM_WINDOW_INFO) {
-    ED_area_newspace(C, sa, SPACE_INFO, false);
+    space_type = SPACE_INFO;
   }
   else {
     BLI_assert(false);



More information about the Bf-blender-cvs mailing list