Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/blender/

2011-05-05 10:14:56 +00:00
parent 61fdadbb2e fbe17e09a3
commit b25346a48c
211 changed files with 5443 additions and 3029 deletions
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1298,7 +1298,7 @@ static struct uiWidgetColors wcol_menu_item= {
 	{255, 255, 255, 255},
 	{0, 0, 0, 255},
 	
-	0,
+	1,
 	38, 0
 };

@@ -1607,8 +1607,6 @@ static void widget_state_menu_item(uiWidgetType *wt, int state)
 	else if(state & UI_ACTIVE) {
 		QUATCOPY(wt->wcol.inner, wt->wcol.inner_sel);
 		VECCOPY(wt->wcol.text, wt->wcol.text_sel);
-		
-		wt->wcol.shaded= 1;
 	}
 }