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/space_sequencer/sequencer_draw.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/space_sequencer/sequencer_draw.c')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 6c76dbd5149..e9539bcc4c9 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -177,7 +177,11 @@ void color3ubv_from_seq(Scene *curscene, Sequence *seq, unsigned char col[3])
blendcol[0] = blendcol[1] = blendcol[2] = 128;
if (seq->flag & SEQ_MUTE) UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.5, 20);
break;
-
+
+ case SEQ_TYPE_TEXT:
+ UI_GetThemeColor3ubv(TH_SEQ_TEXT, col);
+ break;
+
default:
col[0] = 10; col[1] = 255; col[2] = 40;
break;