Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2019-09-04 02:47:16 +0300
committerJulian Eisel <eiseljulian@gmail.com>2019-09-04 02:47:16 +0300
commit0c7bfdf9a50de0c98e7e9ee55511c842148dae6b (patch)
tree8e299cf85cf8a6fc8909f1668215a1e8862bb78e /source/blender/windowmanager/intern
parent1886a2f3f5982eedc30ae66217f1adf72933d678 (diff)
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.
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r--source/blender/windowmanager/intern/wm_window.c2
1 files changed, 1 insertions, 1 deletions
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);