[Bf-blender-cvs] [8c0ecb5] UI-experiments: Merge branch 'UI-graphical-redesign' into UI-experiments

[Julian Eisel]

Commit: 8c0ecb5ac6f8f8cbb2ffbd3ef20842388e83dc37
Author: Julian Eisel
Date:   Wed Jun 10 15:28:19 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rB8c0ecb5ac6f8f8cbb2ffbd3ef20842388e83dc37

Merge branch 'UI-graphical-redesign' into UI-experiments

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



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

diff --cc source/blender/makesdna/DNA_userdef_types.h
index d512db8,974bb0b..df6fa73
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -175,9 -168,11 +175,12 @@@ typedef struct ThemeUI 
  	
  	uiWidgetStateColors wcol_state;
  
 +	uiTabColors tab;
  	uiPanelColors panel; /* depricated, but we keep it for do_versions (2.66.1) */
  
+ 	short interface_style; /* flat/classic - don't confuse with uiStyle */
+ 	short pad2;
+ 
  	char area_edges[4];
  
  	char widget_emboss[4];
diff --cc source/blender/makesrna/intern/rna_userdef.c
index 9ee4547,cc2ee46..0846cb8
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@@ -958,9 -926,14 +958,15 @@@ static void rna_def_userdef_theme_ui(Bl
  	StructRNA *srna;
  	PropertyRNA *prop;
  
+ 	static EnumPropertyItem interface_style_items[] = {
+ 		{TH_IFACE_STYLE_CLASSIC, "CLASSIC", 0, "Classic", "Use a classic interface drawing style"},
+ 		{TH_IFACE_STYLE_FLAT,    "FLAT",    0, "Flat",    "Use a flat interface drawing style"},
+ 		{0, NULL, 0, NULL, NULL}
+ 	};
+ 
  	rna_def_userdef_theme_ui_wcol(brna);
  	rna_def_userdef_theme_ui_wcol_state(brna);
 +	rna_def_userdef_theme_ui_tabs(brna);
  	rna_def_userdef_theme_ui_panel(brna);
  	rna_def_userdef_theme_ui_gradient(brna);