diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-08 21:05:09 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-08 21:05:09 +0400 |
| commit | d2d9004991ab2ec618825766b99b6d11c8d3d308 (patch) | |
| tree | 8f7965b283b83aa10f985b3204cdc4086315b7de | |
| parent | af807bd24d8be85988a8239bbfa26daeea5633e9 (diff) | |
Fix #36243: one screen should never be used by multiple windows, but this could
happen when a screen was maximized to a single editor, now that case is disabled
too.
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index d9dc5648ae3..498762f1603 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1378,10 +1378,7 @@ void ED_screen_set(bContext *C, bScreen *sc) if (id == NULL) return; - /* check for valid winid */ - if (sc->winid != 0 && sc->winid != win->winid) - return; - + if (sc->full) { /* find associated full */ bScreen *sc1; for (sc1 = bmain->screen.first; sc1; sc1 = sc1->id.next) { @@ -1392,6 +1389,10 @@ void ED_screen_set(bContext *C, bScreen *sc) } } } + + /* check for valid winid */ + if (sc->winid != 0 && sc->winid != win->winid) + return; if (oldscreen != sc) { wmTimer *wt = oldscreen->animtimer; |