Commit: 7759782ee7c4e654641c9f7abb51631c86e3f29c
Author: Julian Eisel
Date: Tue Jun 23 06:33:50 2015 +0200
Branches: UI-graphical-redesign
https://developer.blender.org/rB7759782ee7c4e654641c9f7abb51631c86e3f29c
Merge branch 'master' into UI-graphical-redesign
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 5bbbe0c,58cf6b9..c679848
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -6509,11 -6543,9 +6522,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 35b3685,68016ae..88b4395
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2627,27 -2620,13 +2627,33 @@@ 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;
+
+ 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;