[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58081] trunk/blender/source/blender/ editors/screen/area.c: Fix #36059: region overlap did not show scopes overlapping in the image editor.

[Brecht Van Lommel]

Revision: 58081
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58081
Author:   blendix
Date:     2013-07-08 18:27:32 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Fix #36059: region overlap did not show scopes overlapping in the image editor.
It's only enabled for some particular regions, this one makes sense to show.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/area.c

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2013-07-08 17:56:51 UTC (rev 58080)
+++ trunk/blender/source/blender/editors/screen/area.c	2013-07-08 18:27:32 UTC (rev 58081)
@@ -908,11 +908,19 @@
 /* overlapping regions only in the following restricted cases */
 static int region_is_overlap(wmWindow *win, ScrArea *sa, ARegion *ar)
 {
-	if (U.uiflag2 & USER_REGION_OVERLAP)
-		if (WM_is_draw_triple(win))
-			if (ELEM4(sa->spacetype, SPACE_VIEW3D, SPACE_IMAGE, SPACE_SEQ, SPACE_CLIP))
+	if (U.uiflag2 & USER_REGION_OVERLAP) {
+		if (WM_is_draw_triple(win)) {
+			if (ELEM(sa->spacetype, SPACE_VIEW3D, SPACE_SEQ)) {
 				if (ELEM3(ar->regiontype, RGN_TYPE_TOOLS, RGN_TYPE_UI, RGN_TYPE_TOOL_PROPS))
 					return 1;
+			}
+			else if (ELEM(sa->spacetype, SPACE_IMAGE, SPACE_CLIP)) {
+				if (ELEM4(ar->regiontype, RGN_TYPE_TOOLS, RGN_TYPE_UI, RGN_TYPE_TOOL_PROPS, RGN_TYPE_PREVIEW))
+					return 1;
+			}
+		}
+	}
+
 	return 0;
 }