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 06:59:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-08-26 07:04:03 +0300
commit0b216578978a44f2649c45ac4a5ed07e73c80c33 (patch)
tree46e270f3f157f6d6f7dbbf49875c1ff05e821e91 /source/blender/makesrna
parent67970da107f40db449f60c0db30e3d46f4ee726e (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/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_wm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 8dd995205c9..aa4bfe0462e 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -615,6 +615,11 @@ static void rna_Window_screen_set(PointerRNA *ptr, PointerRNA value)
{
wmWindow *win = (wmWindow *)ptr->data;
+ /* disallow ID-browsing away from temp screens */
+ if (win->screen->temp) {
+ return;
+ }
+
if (value.data == NULL)
return;