[Bf-blender-cvs] [0ecc125] UI-experiments: Merge branch 'master' into UI-experiments

[Julian Eisel]

Commit: 0ecc1252c616e2710d3930ce504dde3bd673386c
Author: Julian Eisel
Date:   Fri May 8 00:01:11 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rB0ecc1252c616e2710d3930ce504dde3bd673386c

Merge branch 'master' into UI-experiments

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



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

diff --cc source/blender/makesdna/DNA_screen_types.h
index aadc07c,eb76c90..eccfcbe
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@@ -373,9 -372,10 +373,11 @@@ enum 
  	RGN_TYPE_UI = 4,
  	RGN_TYPE_TOOLS = 5,
  	RGN_TYPE_TOOL_PROPS = 6,
 -	RGN_TYPE_PREVIEW = 7
 +	RGN_TYPE_PREVIEW = 7,
 +	RGN_TYPE_TABS = 8
  };
+ /* use for function args */
+ #define RGN_TYPE_ANY -1
  
  /* region alignment */
  #define RGN_ALIGN_NONE		0
diff --cc source/blender/windowmanager/intern/wm_event_system.c
index dc8db31,69bee8b..cde7173
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@@ -1089,13 -1109,13 +1109,13 @@@ static int wm_operator_invoke(bContext 
  				}
  				else {
  					wrap = (U.uiflag & USER_CONTINUOUS_MOUSE) &&
- 					       ((op->flag & OP_GRAB_POINTER) || (ot->flag & OPTYPE_GRAB_POINTER));
+ 					       ((op->flag & OP_IS_MODAL_GRAB_CURSOR) || (ot->flag & OPTYPE_GRAB_CURSOR));
  				}
  
 -				/* exception, cont. grab in header is annoying */
 +				/* exception, cont. grab in header or tab regions is annoying */
  				if (wrap) {
  					ARegion *ar = CTX_wm_region(C);
 -					if (ar && ar->regiontype == RGN_TYPE_HEADER) {
 +					if (ar && ELEM(ar->regiontype, RGN_TYPE_HEADER, RGN_TYPE_TABS)) {
  						wrap = false;
  					}
  				}