[Bf-blender-cvs] [67970da] master: Disallow navigating away from a full-temp screen

Campbell Barton noreply at git.blender.org
Wed Aug 26 06:09:57 CEST 2015


Commit: 67970da107f40db449f60c0db30e3d46f4ee726e
Author: Campbell Barton
Date:   Wed Aug 26 13:51:41 2015 +1000
Branches: master
https://developer.blender.org/rB67970da107f40db449f60c0db30e3d46f4ee726e

Disallow navigating away from a full-temp screen

===================================================================

M	source/blender/editors/screen/screen_ops.c

===================================================================

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index e8d7619..4a4d78e 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2373,8 +2373,9 @@ static int screen_set_exec(bContext *C, wmOperator *op)
 	int delta = RNA_int_get(op->ptr, "delta");
 	
 	/* temp screens are for userpref or render display */
-	if (screen->temp)
+	if (screen->temp || (sa->full && sa->full->temp)) {
 		return OPERATOR_CANCELLED;
+	}
 	
 	if (delta == 1) {
 		while (tot--) {




More information about the Bf-blender-cvs mailing list