Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2015-12-02 01:56:48 +0300
committerJulian Eisel <eiseljulian@gmail.com>2015-12-02 02:01:36 +0300
commit5cbf58ce8b5463a0c3296a753c26615c357aca17 (patch)
treecab85fcfd0bc5f8ca8effc8dd2f6be8803eefd00 /source/blender/editors/interface/resources.c
parenta6bbf05ba6268638f5e131fe8a7db5a90e5d7c60 (diff)
Fix T46909: Text strip not themeable
Normally we don't allow adding new theme options if we can avoid it, but this is a legit exception since all other strips are themeable. Default color for text strip is now yellow-ish. Not nice but there are also not many other colors left.
Diffstat (limited to 'source/blender/editors/interface/resources.c')
-rw-r--r--source/blender/editors/interface/resources.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 294aa6ce2ac..5fb1afac34f 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -492,6 +492,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
cp = ts->transition; break;
case TH_SEQ_META:
cp = ts->meta; break;
+ case TH_SEQ_TEXT:
+ cp = ts->text_strip; break;
case TH_SEQ_PREVIEW:
cp = ts->preview_back; break;
@@ -1062,6 +1064,7 @@ void ui_theme_init_default(void)
rgba_char_args_set(btheme->tseq.effect, 169, 84, 124, 255);
rgba_char_args_set(btheme->tseq.transition, 162, 95, 111, 255);
rgba_char_args_set(btheme->tseq.meta, 109, 145, 131, 255);
+ rgba_char_args_set(btheme->tseq.text_strip, 162, 151, 0, 255);
rgba_char_args_set(btheme->tseq.preview_back, 0, 0, 0, 255);
rgba_char_args_set(btheme->tseq.grid, 64, 64, 64, 255);
@@ -2668,6 +2671,13 @@ void init_userdef_do_versions(void)
}
}
+ if (!USER_VERSION_ATLEAST(276, 3)) {
+ bTheme *btheme;
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ rgba_char_args_set(btheme->tseq.text_strip, 162, 151, 0, 255);
+ }
+ }
+
if (U.pixelsize == 0.0f)
U.pixelsize = 1.0f;