UI:

* Screen level regions created for menus are now a separate
  CTX_wm_menu in the context, so they don't interfere with
  existing regions.
* Fix context in popup menus to always come from the area
  and region the popup was opened from.
* Removed some unused context stuff: tasks and reports.
  The places that were using context reports were using it
  wrong anyway.
* Fix F6 closing immediately after editing a button, by
  making uiBlockSetFlag not clear existing flags anymore.
* Don't use ":" in boolean X/Y/Z buttons.

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 7dc30695862..ef89b2b35ad 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -111,9 +111,9 @@ static void wm_method_draw_full(bContext *C, wmWindow *win)
 	/* draw overlapping regions */
 	for(ar=screen->regionbase.first; ar; ar= ar->next) {
 		if(ar->swinid) {
-			CTX_wm_region_set(C, ar);
+			CTX_wm_menu_set(C, ar);
 			ED_region_do_draw(C, ar);
-			CTX_wm_region_set(C, NULL);
+			CTX_wm_menu_set(C, NULL);
 		}
 	}
 
@@ -245,9 +245,9 @@ static void wm_method_draw_overlap_all(bContext *C, wmWindow *win)
 	/* draw marked overlapping regions */
 	for(ar=screen->regionbase.first; ar; ar= ar->next) {
 		if(ar->swinid && ar->do_draw) {
-			CTX_wm_region_set(C, ar);
+			CTX_wm_menu_set(C, ar);
 			ED_region_do_draw(C, ar);
-			CTX_wm_region_set(C, NULL);
+			CTX_wm_menu_set(C, NULL);
 		}
 	}
 
@@ -558,9 +558,9 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win)
 	/* draw overlapping regions */
 	for(ar=screen->regionbase.first; ar; ar= ar->next) {
 		if(ar->swinid) {
-			CTX_wm_region_set(C, ar);
+			CTX_wm_menu_set(C, ar);
 			ED_region_do_draw(C, ar);
-			CTX_wm_region_set(C, NULL);
+			CTX_wm_menu_set(C, NULL);
 		}
 	}