[Bf-blender-cvs] [0dd2ed3] UI-graphical-redesign: Merge branch 'master' into UI-graphical-redesign

[Julian Eisel]

Commit: 0dd2ed3c6c54763979ba38406500e087eda5ef84
Author: Julian Eisel
Date:   Sat May 30 20:40:30 2015 +0200
Branches: UI-graphical-redesign
https://developer.blender.org/rB0dd2ed3c6c54763979ba38406500e087eda5ef84

Merge branch 'master' into UI-graphical-redesign

Conflicts:
	source/blender/editors/interface/interface_widgets.c

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



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

diff --cc source/blender/editors/interface/interface_widgets.c
index 30aa1b7,ec5a204..d6845bf
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -2221,10 -2221,10 +2221,10 @@@ static void widget_menu_back(uiWidgetCo
  	}
  	
  	glEnable(GL_BLEND);
 -	widget_softshadow(rect, roundboxalign, 0.25f * U.widget_unit);
 +	widget_softshadow(rect, roundboxalign, wcol->roundness * U.widget_unit);
  	
 -	round_box_edges(&wtb, roundboxalign, rect, 0.25f * U.widget_unit);
 -	wtb.draw_emboss = false;
 +	round_box_edges(&wtb, roundboxalign, rect, wcol->roundness * U.widget_unit);
- 	wtb.emboss = 0;
++	wtb.draw_emboss = 0;
  	widgetbase_draw(&wtb, wcol);
  	
  	glDisable(GL_BLEND);
@@@ -2759,11 -2758,11 +2759,11 @@@ void UI_draw_widget_scroll(uiWidgetColo
  	horizontal = (BLI_rcti_size_x(rect) > BLI_rcti_size_y(rect));
  
  	if (horizontal)
 -		rad = 0.5f * BLI_rcti_size_y(rect);
 +		rad = wcol->roundness * BLI_rcti_size_y(rect);
  	else
 -		rad = 0.5f * BLI_rcti_size_x(rect);
 +		rad = wcol->roundness * BLI_rcti_size_x(rect);
  	
- 	wtb.shadedir = (horizontal) ? 1 : 0;
+ 	wtb.draw_shadedir = (horizontal) ? true : false;
  	
  	/* draw back part, colors swapped and shading inverted */
  	if (horizontal)
@@@ -3089,10 -3088,10 +3089,10 @@@ static void widget_icon_has_anim(uiBut 
  		float rad;
  		
  		widget_init(&wtb);
- 		wtb.outline = 0;
+ 		wtb.draw_outline = false;
  		
  		/* rounded */
 -		rad = 0.5f * BLI_rcti_size_y(rect);
 +		rad = wcol->roundness * BLI_rcti_size_y(rect);
  		round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
  		widgetbase_draw(&wtb, wcol);
  	}
@@@ -3241,7 -3240,8 +3241,7 @@@ static void widget_list_itembut(uiWidge
  	widget_init(&wtb);
  	
  	/* rounded, but no outline */
- 	wtb.outline = 0;
+ 	wtb.draw_outline = false;
 -	rad = 0.2f * U.widget_unit;
  	round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
  	
  	widgetbase_draw(&wtb, wcol);