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 04:27:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-08-26 04:27:13 +0300
commite066a3331470b90decae5a897e314c3fe0c1703b (patch)
tree5b7a1a9ac80980d7fb32970d0c356323656cd22c /source/blender/editors/screen/screen_edit.c
parent2e6cbd9bda1221036c4ec800d6e6aea35c436965 (diff)
Fix crash setting the screen when one is maximized
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
-rw-r--r--source/blender/editors/screen/screen_edit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index b714eb00169..430597ef0ca 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1487,7 +1487,8 @@ void ED_screen_set(bContext *C, bScreen *sc)
return;
- if (sc->state == SCREENFULL) { /* find associated full */
+ if (ELEM(sc->state, SCREENMAXIMIZED, SCREENFULL)) {
+ /* find associated full */
bScreen *sc1;
for (sc1 = bmain->screen.first; sc1; sc1 = sc1->id.next) {
ScrArea *sa = sc1->areabase.first;