diff options
| author | Joshua Leung <aligorith@gmail.com> | 2014-01-16 14:56:40 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2014-01-17 05:53:02 +0400 |
| commit | d8fa72bfb187f8091aa22e6acc0b00d254b807db (patch) | |
| tree | fd0335b0315ffb41a60a78a2e01798618f85772c /source/blender/editors/interface | |
| parent | 5e5b0cee4fc364eade49798baa9e312e9211799b (diff) | |
Assorted polish fixes for keyframe theme settings patch
* Version patching fixes for theme settings
* Added missing support for NLA (needed for the keyframes drawn in the action lines)
* Fix for a lack of contrast between selected and unselected extreme keyframe type
(restoring it back to the pre-patch color scheme)
* Fix for keyframes on protected channels not being drawn with partial opacity
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 38f185304e8..e54d4b277b0 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -915,12 +915,12 @@ void ui_theme_init_default(void) rgba_char_args_set(btheme->tact.keytype_keyframe, 232, 232, 232, 255); rgba_char_args_set(btheme->tact.keytype_keyframe_select, 255, 190, 50, 255); - rgba_char_args_set(btheme->tact.keytype_extreme, 237, 178, 204, 255); - rgba_char_args_set(btheme->tact.keytype_extreme_select, 242, 127, 127, 255); - rgba_char_args_set(btheme->tact.keytype_breakdown, 178, 219, 232, 255); + rgba_char_args_set(btheme->tact.keytype_extreme, 232, 179, 204, 255); + rgba_char_args_set(btheme->tact.keytype_extreme_select, 242, 128, 128, 255); + rgba_char_args_set(btheme->tact.keytype_breakdown, 179, 219, 232, 255); rgba_char_args_set(btheme->tact.keytype_breakdown_select, 84, 191, 237, 255); rgba_char_args_set(btheme->tact.keytype_jitter, 148, 229, 117, 255); - rgba_char_args_set(btheme->tact.keytype_jitter_select, 97, 191, 066, 255); + rgba_char_args_set(btheme->tact.keytype_jitter_select, 97, 192, 66, 255); rgba_char_args_set(btheme->tact.keyborder, 0, 0, 0, 255); rgba_char_args_set(btheme->tact.keyborder_select, 0, 0, 0, 255); @@ -941,6 +941,9 @@ void ui_theme_init_default(void) rgba_char_args_set(btheme->tnla.nla_sound, 43, 61, 61, 255); rgba_char_args_set(btheme->tnla.nla_sound_sel, 31, 122, 122, 255); + rgba_char_args_set(btheme->tnla.keyborder, 0, 0, 0, 255); + rgba_char_args_set(btheme->tnla.keyborder_select, 0, 0, 0, 255); + /* space file */ /* to have something initialized */ btheme->tfile = btheme->tv3d; @@ -2343,12 +2346,35 @@ void init_userdef_do_versions(void) rgba_char_args_test_set(btheme->tinfo.info_debug_text, 0, 0, 0, 255); } } - + if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 9)) { + bTheme *btheme; + U.tw_size = U.tw_size * 5.0f; - } - - if (U.versionfile < 270) { + + /* Action Editor (and NLA Editor) - Keyframe Colors */ + for (btheme = U.themes.first; btheme; btheme = btheme->next) { + /* Action Editor ................. */ + /* key types */ + rgba_char_args_set(btheme->tact.keytype_keyframe, 232, 232, 232, 255); + rgba_char_args_set(btheme->tact.keytype_keyframe_select, 255, 190, 50, 255); + rgba_char_args_set(btheme->tact.keytype_extreme, 232, 179, 204, 255); + rgba_char_args_set(btheme->tact.keytype_extreme_select, 242, 128, 128, 255); + rgba_char_args_set(btheme->tact.keytype_breakdown, 179, 219, 232, 255); + rgba_char_args_set(btheme->tact.keytype_breakdown_select, 84, 191, 237, 255); + rgba_char_args_set(btheme->tact.keytype_jitter, 148, 229, 117, 255); + rgba_char_args_set(btheme->tact.keytype_jitter_select, 97, 192, 66, 255); + + /* key border */ + rgba_char_args_set(btheme->tact.keyborder, 0, 0, 0, 255); + rgba_char_args_set(btheme->tact.keyborder_select, 0, 0, 0, 255); + + /* NLA ............................ */ + /* key border */ + rgba_char_args_set(btheme->tnla.keyborder, 0, 0, 0, 255); + rgba_char_args_set(btheme->tnla.keyborder_select, 0, 0, 0, 255); + } + /* grease pencil - new layer color */ if (U.gpencil_new_layer_col[3] < 0.1f) { /* defaults to black, but must at least be visible! */ |