diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 06:59:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 07:04:03 +0300 |
| commit | 0b216578978a44f2649c45ac4a5ed07e73c80c33 (patch) | |
| tree | 46e270f3f157f6d6f7dbbf49875c1ff05e821e91 /source/blender/editors/screen/screen_ops.c | |
| parent | 67970da107f40db449f60c0db30e3d46f4ee726e (diff) | |
Fix T45369: Temp screen locks UI
It was possible to navigate into an unused temp screen
(using Ctrl+Arrow keys), but there was no way to navigate back out.
Now Ctrl+Arrows skips temp screens, and remove the ability to navigate away from a temp screen from RNA.
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 4a4d78e16ab..5acb6bd2381 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2356,6 +2356,9 @@ static void SCREEN_OT_marker_jump(wmOperatorType *ot) static bool screen_set_is_ok(bScreen *screen, bScreen *screen_prev) { return ((screen->winid == 0) && + /* in typical useage these should have a nonzero winid + * (all temp screens should be used, or closed & freed). */ + (screen->temp == false) && (screen->state == SCREENNORMAL) && (screen != screen_prev) && (screen->id.name[2] != '.' || !(U.uiflag & USER_HIDE_DOT))); |