Commit: 5cbf58ce8b5463a0c3296a753c26615c357aca17
Author: Julian Eisel
Date: Tue Dec 1 23:56:48 2015 +0100
Branches: master
https://developer.blender.org/rB5cbf58ce8b5463a0c3296a753c26615c357aca17
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.
===================================================================
M source/blender/blenkernel/BKE_blender.h
M source/blender/blenloader/intern/versioning_270.c
M source/blender/editors/include/UI_resources.h
M source/blender/editors/interface/resources.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_blender.h
b/source/blender/blenkernel/BKE_blender.h
index 607f2a9..8734eac 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -42,7 +42,7 @@ extern "C" {
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 276
-#define BLENDER_SUBVERSION 2
+#define BLENDER_SUBVERSION 3
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
#define BLENDER_MINSUBVERSION 5
diff --git a/source/blender/blenloader/intern/versioning_270.c
b/source/blender/blenloader/intern/versioning_270.c
index b5199e1..a0248d5 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -920,7 +920,7 @@ void blo_do_versions_270(FileData *fd, Library
*UNUSED(lib), Main *main)
}
- {
+ if (!MAIN_VERSION_ATLEAST(main, 276, 3)) {
if (!DNA_struct_elem_find(fd->filesdna, "RenderData",
"CurveMapping", "mblur_shutter_curve")) {
Scene *scene;
for (scene = main->scene.first; scene != NULL; scene =
scene->id.next) {
diff --git a/source/blender/editors/include/UI_resources.h
b/source/blender/editors/include/UI_resources.h
index cd68425..dc84395 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -200,8 +200,9 @@ enum {
TH_SEQ_EFFECT,
TH_SEQ_TRANSITION,
TH_SEQ_META,
+ TH_SEQ_TEXT,
TH_SEQ_PREVIEW,
-
+
TH_EDGE_SHARP,
TH_EDITMESH_ACTIVE,
diff --git a/source/blender/editors/interface/resources.c
b/source/blender/editors/interface/resources.c
index 294aa6c..5fb1afa 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;
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c
b/source/blender/editors/space_sequencer/sequencer_draw.c
index 6c76dbd..e9539bc 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;
diff --git a/source/blender/makesdna/DNA_userdef_types.h
b/source/blender/makesdna/DNA_userdef_types.h
index f0b8e04..af1dfc6 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -284,7 +284,7 @@ typedef struct ThemeSpace {
char nodeclass_pattern[4], nodeclass_layout[4];
char movie[4], movieclip[4], mask[4], image[4], scene[4], audio[4];
/* for sequence editor */
- char effect[4], transition[4], meta[4];
+ char effect[4], transition[4], meta[4], text_strip[4], pad[4];
char editmesh_active[4];
char handle_vertex[4];
diff --git a/source/blender/makesrna/intern/rna_userdef.c
b/source/blender/makesrna/intern/rna_userdef.c
index 34768cf..f8bf6d1 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2548,6 +2548,11 @@ static void rna_def_userdef_theme_space_seq(BlenderRNA
*brna)
RNA_def_property_ui_text(prop, "Meta Strip", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
+ prop = RNA_def_property(srna, "text_strip", PROP_FLOAT,
PROP_COLOR_GAMMA);
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_ui_text(prop, "Text Strip", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_update");
+
prop = RNA_def_property(srna, "frame_current", PROP_FLOAT,
PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "cframe");
RNA_def_property_array(prop, 3);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
