[Bf-blender-cvs] [1f5e474] UI-experiments: Merge branch 'master' into UI-experiments

[Julian Eisel]

Commit: 1f5e4741b0211eba1cd2405c9d5e07c9d1d19cf8
Author: Julian Eisel
Date:   Mon Jul 13 01:50:33 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rB1f5e4741b0211eba1cd2405c9d5e07c9d1d19cf8

Merge branch 'master' into UI-experiments

Conflicts:
	source/blender/editors/interface/resources.c
	source/blender/editors/screen/area.c

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



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

diff --cc source/blender/editors/interface/resources.c
index b862d83,e831144..5bc6fb4
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2634,55 -2631,10 +2637,29 @@@ void init_userdef_do_versions(void
  		}
  	}
  
- 	if (U.versionfile < 275 || (U.versionfile == 275 && U.subversionfile < 2)) {
+ 	if (!USER_VERSION_ATLEAST(275, 2)) {
+ 		U.ndof_deadzone = 0.1;
+ 	}
+ 
++	if (!USER_VERSION_ATLEAST(275, 3)) {
 +		bTheme *btheme;
 +		ThemeSpace *ts;
 +
 +		/* interface_widgets.c */
 +		struct uiWidgetColors wcol_tab = {
 +			{255, 255, 255, 255},
 +			{83, 83, 83, 255},    /* gets overwritten later */
 +			{114, 114, 114, 255}, /* gets overwritten later */
 +			{90, 90, 90, 255},
 +
 +			{0, 0, 0, 255},       /* gets overwritten later */
 +			{0, 0, 0, 255},
 +
 +			0,
 +			0, 0
 +		};
- 
- 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
- 			btheme->tui.wcol_tab = wcol_tab;
- 			for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) {
- 				copy_v4_v4_char(ts->tabs.tab_active, ts->tab_active);
- 				copy_v4_v4_char(ts->tabs.tab_inactive, ts->tab_inactive);
- 				copy_v4_v4_char(ts->tabs.tab_back, ts->tab_back);
- 				copy_v4_v4_char(ts->tabs.tab_outline, ts->tab_outline);
- 			}
- 		}
- 	}
- 
- 	if (U.versionfile < 275 || (U.versionfile == 275 && U.subversionfile < 2)) {
- 		bTheme *btheme;
- 		ThemeSpace *ts;
- 
- 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
- 			for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) {
- 				/* XXX maybe remove show_back/show_header options? */
- 				ts->panelcolors.show_back = ts->panelcolors.show_header = true;
- 				rgba_char_args_set(ts->panelcolors.back, 128, 128, 128, 255);
- 				rgba_char_args_set(ts->panelcolors.header, 97, 97, 97, 255);
- 			}
- 
- 			rgba_char_args_set_fl(btheme->tui.area_edges, 0.10f, 0.10f, 0.10f, 1.0f);
- 
- 			btheme->tui.interface_style = TH_IFACE_STYLE_FLAT;
- 
- 			ui_widget_color_init(&btheme->tui);
- 		}
 +	}
 +
  	if (U.pixelsize == 0.0f)
  		U.pixelsize = 1.0f;
  	
diff --cc source/blender/editors/screen/area.c
index a765347,48b0037..d7e91a1
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@@ -75,13 -75,10 +75,13 @@@ extern void ui_draw_anti_tria(float x1
  
  /* general area and region code */
  
- static void region_draw_emboss(ARegion *ar, rcti *scirct)
+ static void region_draw_emboss(const ARegion *ar, const rcti *scirct)
  {
  	rcti rect;
 -	
 +
 +	if (!ELEM(ar->regiontype, RGN_TYPE_HEADER, RGN_TYPE_TOOL_PROPS))
 +		return;
 +
  	/* translate scissor rect to region space */
  	rect.xmin = scirct->xmin - ar->winrct.xmin;
  	rect.ymin = scirct->ymin - ar->winrct.ymin;