[Bf-blender-cvs] [87aca8bd02b] master: UI: disallow splitting of temporary screens

Campbell Barton noreply at git.blender.org
Thu Mar 14 01:14:17 CET 2019


Commit: 87aca8bd02bca78e4446de73653ada566780823e
Author: Campbell Barton
Date:   Thu Mar 14 11:12:52 2019 +1100
Branches: master
https://developer.blender.org/rB87aca8bd02bca78e4446de73653ada566780823e

UI: disallow splitting of temporary screens

D4510 by @harley

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

M	source/blender/editors/screen/area.c
M	source/blender/editors/screen/screen_draw.c

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

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index a430ccdc95e..411826d79c1 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -750,6 +750,10 @@ static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea
 		return;
 	}
 
+	if (screen->temp) {
+		return;
+	}
+
 	float coords[4][4] = {
 	    /* Bottom-left. */
 	    {sa->totrct.xmin - U.pixelsize,
diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/screen/screen_draw.c
index 84eb723a43d..a5d0bbacd91 100644
--- a/source/blender/editors/screen/screen_draw.c
+++ b/source/blender/editors/screen/screen_draw.c
@@ -27,6 +27,7 @@
 #include "GPU_matrix.h"
 #include "GPU_state.h"
 
+#include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_rect.h"
 
@@ -370,6 +371,10 @@ void ED_screen_draw_edges(wmWindow *win)
 		return;
 	}
 
+	if (screen->temp && BLI_listbase_is_single(&screen->areabase)) {
+		return;
+	}
+
 	const int winsize_x = WM_window_pixels_x(win);
 	const int winsize_y = WM_window_pixels_y(win);
 	float col[4], corner_scale, edge_thickness;



More information about the Bf-blender-cvs mailing list