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

[Julian Eisel]

Commit: d4d97f79f47803f4a4b1d7a0e04ec7ed7d77691e
Author: Julian Eisel
Date:   Tue Jun 23 06:24:10 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rBd4d97f79f47803f4a4b1d7a0e04ec7ed7d77691e

Merge branch 'master' into UI-experiments

Conflicts:
	source/blender/blenkernel/BKE_blender.h
	source/blender/editors/interface/resources.c

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



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

diff --cc source/blender/blenkernel/BKE_blender.h
index 1af96f9,8367fd4..1638ba4
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@@ -41,8 -41,8 +41,8 @@@ extern "C" 
  /* these lines are grep'd, watch out for our not-so-awesome regex
   * and keep comment above the defines.
   * Use STRINGIFY() rather than defining with quotes */
- #define BLENDER_VERSION         274
- #define BLENDER_SUBVERSION      6
+ #define BLENDER_VERSION         275
 -#define BLENDER_SUBVERSION      1
++#define BLENDER_SUBVERSION      2
  /* Several breakages with 270, e.g. constraint deg vs rad */
  #define BLENDER_MINVERSION      270
  #define BLENDER_MINSUBVERSION   5
diff --cc source/blender/editors/interface/interface_handlers.c
index 86ef06a,58cf6b9..0075df8
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -6521,11 -6543,9 +6534,11 @@@ static bool ui_but_menu(bContext *C, ui
  				uiItemBooleanO(layout, CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Insert Keyframe"),
  				               ICON_NONE, "ANIM_OT_keyframe_insert_button", "all", 1);
  			}
 +
 +			is_first_item = false;
  		}
  		
- 		if (but->flag & UI_BUT_ANIMATED) {
+ 		if ((but->flag & UI_BUT_ANIMATED) && (but->rnapoin.type != &RNA_NlaStrip)) {
  			if (is_array_component) {
  				uiItemBooleanO(layout, CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Clear Keyframes"),
  				               ICON_NONE, "ANIM_OT_keyframe_clear_button", "all", 1);
diff --cc source/blender/editors/interface/resources.c
index bc5c071,68016ae..b862d83
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2627,55 -2620,13 +2627,62 @@@ void init_userdef_do_versions(void
  		}
  	}
  
- 	if (U.versionfile < 274 || (U.versionfile == 274 && U.subversionfile < 6)) {
+ 	if (U.versionfile < 275 || (U.versionfile == 275 && U.subversionfile < 1)) {
+ 		bTheme *btheme;
+ 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ 			copy_v4_v4_char(btheme->tclip.metadatatext, btheme->tseq.text_hi);
+ 		}
+ 	}
+ 
++	if (U.versionfile < 275 || (U.versionfile == 275 && U.subversionfile < 2)) {
 +		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 < 274 || (U.versionfile == 274 && U.subversionfile < 6)) {
++	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;