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

[Antony Riakiotakis]

Commit: f268dfe88e167bde4d9c307f8d764760304b5d74
Author: Antony Riakiotakis
Date:   Sun May 25 19:47:01 2014 +0300
https://developer.blender.org/rBf268dfe88e167bde4d9c307f8d764760304b5d74

Merge branch 'master' into pie-menus

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



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

diff --cc source/blender/editors/interface/interface.c
index 9b671a9,19d4e32..aea3739
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@@ -95,9 -94,22 +94,22 @@@ bool ui_block_is_menu(const uiBlock *bl
  {
  	return (((block->flag & UI_BLOCK_LOOP) != 0) &&
  	        /* non-menu popups use keep-open, so check this is off */
 -	        ((block->flag & UI_BLOCK_KEEP_OPEN) == 0));
 +			((block->flag & UI_BLOCK_KEEP_OPEN) == 0));
  }
  
+ static bool ui_is_but_unit_radians_ex(UnitSettings *unit, const int unit_type)
+ {
+ 	return (unit->system_rotation == USER_UNIT_ROT_RADIANS && unit_type == PROP_UNIT_ROTATION);
+ }
+ 
+ static bool ui_is_but_unit_radians(const uiBut *but)
+ {
+ 	UnitSettings *unit = but->block->unit;
+ 	const int unit_type = uiButGetUnitType(but);
+ 
+ 	return ui_is_but_unit_radians_ex(unit, unit_type);
+ }
+ 
  /* ************* window matrix ************** */
  
  void ui_block_to_window_fl(const ARegion *ar, uiBlock *block, float *x, float *y)