[Bf-blender-cvs] [cc60f35] master: Delete could assign a temp screen
Campbell Barton
noreply at git.blender.org
Wed Aug 26 06:22:14 CEST 2015
Commit: cc60f35a18041d7dd364cba223b46dbcbd036e43
Author: Campbell Barton
Date: Wed Aug 26 14:14:50 2015 +1000
Branches: master
https://developer.blender.org/rBcc60f35a18041d7dd364cba223b46dbcbd036e43
Delete could assign a temp screen
===================================================================
M source/blender/editors/screen/screen_edit.c
===================================================================
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index b2609b4..0ddf08c 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;
}
More information about the Bf-blender-cvs
mailing list