[Bf-blender-cvs] [17d35f9] pie-menus: Merge branch 'master' into pie-menus

[Campbell Barton]

Commit: 17d35f9e8072716519444021b589b433fc7e651c
Author: Campbell Barton
Date:   Sun Jul 20 16:32:16 2014 +1000
https://developer.blender.org/rB17d35f9e8072716519444021b589b433fc7e651c

Merge branch 'master' into pie-menus

Conflicts:
	source/blender/editors/interface/interface.c
	source/blender/windowmanager/intern/wm_event_system.c

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



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

diff --cc source/blender/editors/interface/interface.c
index 692d26c,dc9dd61..1a936e1
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@@ -3053,11 -3028,8 +3053,11 @@@ static uiBut *ui_def_but(uiBlock *block
  		}
  	}
  
 -	if ((block->flag & UI_BLOCK_LOOP) ||
 -	    ELEM(but->type, MENU, TEX, LABEL, BLOCK, BUTM, SEARCH_MENU, PROGRESSBAR, SEARCH_MENU_UNLINK))
 +	if (block->flag & UI_BLOCK_RADIAL) {
 +		but->drawflag |= UI_BUT_ICON_LEFT;
 +	}
 +	else if ((block->flag & UI_BLOCK_LOOP) ||
- 	         ELEM8(but->type, MENU, TEX, LABEL, BLOCK, BUTM, SEARCH_MENU, PROGRESSBAR, SEARCH_MENU_UNLINK))
++	         ELEM(but->type, MENU, TEX, LABEL, BLOCK, BUTM, SEARCH_MENU, PROGRESSBAR, SEARCH_MENU_UNLINK))
  	{
  		but->drawflag |= (UI_BUT_TEXT_LEFT | UI_BUT_ICON_LEFT);
  	}
diff --cc source/blender/windowmanager/intern/wm_event_system.c
index 100d6d9,256f456..72331f3
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@@ -3399,67 -3404,39 +3405,102 @@@ void WM_event_ndof_to_quat(const struc
  	axis_angle_to_quat(q, axis, angle);
  }
  
++/** \} */
++
+ /* if this is a tablet event, return tablet pressure and set *pen_flip
+  * to 1 if the eraser tool is being used, 0 otherwise */
+ float WM_event_tablet_data(const wmEvent *event, int *pen_flip, float tilt[2])
+ {
+ 	int erasor = 0;
+ 	float pressure = 1;
+ 
+ 	if (tilt)
+ 		zero_v2(tilt);
+ 
+ 	if (event->tablet_data) {
+ 		wmTabletData *wmtab = event->tablet_data;
+ 
+ 		erasor = (wmtab->Active == EVT_TABLET_ERASER);
+ 		if (wmtab->Active != EVT_TABLET_NONE) {
+ 			pressure = wmtab->Pressure;
+ 			if (tilt) {
+ 				tilt[0] = wmtab->Xtilt;
+ 				tilt[1] = wmtab->Ytilt;
+ 			}
+ 		}
+ 	}
+ 
+ 	if (pen_flip)
+ 		(*pen_flip) = erasor;
+ 
+ 	return pressure;
+ }
+ 
+ bool WM_event_is_tablet(const struct wmEvent *event)
+ {
+ 	return (event->tablet_data) ? true : false;
+ }
+ 
+ 
 -/** \} */
 +PointerRNA *WM_operator_pie_macro(const char *idname, const char *name, const char *description,
 +                                         int flag, const char *opname, const char *piename)
 +{
 +	wmOperatorType *ot;
 +	wmOperatorTypeMacro *otmacro;
 +
 +	ot = WM_operatortype_append_macro(idname, name,
 +                                  description, flag);
 +
 +	if (ot) {
 +		otmacro = WM_operatortype_macro_define(ot, "WM_OT_sticky_pie_menu");
 +		RNA_string_set(otmacro->ptr, "name", piename);
 +		otmacro = WM_operatortype_macro_define(ot, opname);
 +		return otmacro->ptr;
 +	}
 +	return NULL;
 +}
 +
 +
 +struct PointerRNA *WM_operator_property_pie_macro(const char *idname, const char *name, const char *description,
 +                                              int flag, const char *piename, const char *opname, const char *propname)
 +{
 +	wmOperatorType *ot;
 +	wmOperatorTypeMacro *otmacro;
 +
 +	ot = WM_operatortype_append_macro(idname, name,
 +                                  description, flag);
 +
 +	if (ot) {
 +		otmacro = WM_operatortype_macro_define(ot, "WM_OT_sticky_pie_menu");
 +		RNA_string_set(otmacro->ptr, "name", piename);
 +		RNA_string_set(otmacro->ptr, "op_name", opname);
 +		RNA_string_set(otmacro->ptr, "prop_name", propname);
 +		RNA_enum_set(otmacro->ptr, "mode", STICKY_PIE_PROPERTY);
 +		otmacro = WM_operatortype_macro_define(ot, opname);
 +		return otmacro->ptr;
 +	}
 +	return NULL;
 +}
 +
 +
 +/* call operator or call pie menu from expanded enum path property */
 +struct PointerRNA *WM_operator_enum_pie_macro(const char *idname, const char *name, const char *description,
 +                                              int flag, const char *piename, const char *opname, const char *path)
 +{
 +	wmOperatorType *ot;
 +	wmOperatorTypeMacro *otmacro;
 +
 +	ot = WM_operatortype_append_macro(idname, name,
 +                                  description, flag);
 +
 +	if (ot) {
 +		otmacro = WM_operatortype_macro_define(ot, "WM_OT_sticky_pie_menu");
 +		RNA_string_set(otmacro->ptr, "name", piename);
 +		RNA_string_set(otmacro->ptr, "data_path", path);
 +		RNA_enum_set(otmacro->ptr, "mode", STICKY_PIE_PATH);
 +		otmacro = WM_operatortype_macro_define(ot, opname);
 +		return otmacro->ptr;
 +	}
 +	return NULL;
 +}
 +
- 
- /** \} */