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:
authorCampbell Barton <ideasman42@gmail.com>2015-08-26 07:14:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-08-26 07:14:50 +0300
commitcc60f35a18041d7dd364cba223b46dbcbd036e43 (patch)
treecb6f7691a6c33bcb67f568b4087754880916749a /source/blender/editors/screen
parent0b216578978a44f2649c45ac4a5ed07e73c80c33 (diff)
Delete could assign a temp screen
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_edit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index b2609b4653d..0ddf08c8404 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1609,12 +1609,12 @@ bool ED_screen_delete(bContext *C, bScreen *sc)
* can safely assume ours is not in use anywhere an delete it */
for (newsc = sc->id.prev; newsc; newsc = newsc->id.prev)
- if (!ed_screen_used(wm, newsc))
+ if (!ed_screen_used(wm, newsc) && !newsc->temp)
break;
if (!newsc) {
for (newsc = sc->id.next; newsc; newsc = newsc->id.next)
- if (!ed_screen_used(wm, newsc))
+ if (!ed_screen_used(wm, newsc) && !newsc->temp)
break;
}