blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T59496: Movie Clip Editor does not display metadata

This commit is contained in:
Sergey Sharybin 2018-12-18 12:27:46 +01:00
parent a3e4c333b9
commit cef41d0144
Notes: blender-bot 2023-02-14 19:45:25 +01:00 
Referenced by issue #59600, Python-made grease pencil strokes not updating until manual stroke added
Referenced by issue #59577, Can't Add Hair to OBJ
Referenced by issue #59583, Hair Dynamics: entering particle edit mode with baked cache crashes blender
Referenced by issue #59565, Cycles viewport render crashes with principled hair bsdf
Referenced by issue #59560, Blender 2.8 Beta Crash
Referenced by issue #59496, Movie Clip Editor does not display metadata
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/datafiles/userdef/userdef_default_theme.c
View File

@ -906,6 +906,7 @@ const bTheme U_theme_default = {
.path_before = RGBA(0xff0000ff),
.path_after = RGBA(0x0000ffff),
.gp_vertex_size = 1,
.metadatatext = RGBA(0xffffffff),
},
.ttopbar = {
.back = RGBA(0x42424200),

2
source/blender/blenkernel/BKE_blender_version.h
View File

@ -28,7 +28,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 280
#define BLENDER_SUBVERSION 38
#define BLENDER_SUBVERSION 39
/* Several breakages with 280, e.g. collections vs layers */
#define BLENDER_MINVERSION 280
#define BLENDER_MINSUBVERSION 0

4
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -102,6 +102,10 @@ static void do_versions_theme(UserDef *userdef, bTheme *btheme)
copy_v4_v4_char(btheme->tui.wcol_state.inner_changed_sel, U_theme_default.tui.wcol_state.inner_changed_sel);
}
if (!USER_VERSION_ATLEAST(280, 39)) {
copy_v4_v4_char(btheme->tclip.metadatabg, U_theme_default.tima.metadatabg);
copy_v4_v4_char(btheme->tclip.metadatatext, U_theme_default.tima.metadatatext);
}
#undef USER_VERSION_ATLEAST
}

12
source/blender/makesrna/intern/rna_userdef.c
View File

@ -3140,6 +3140,18 @@ static void rna_def_userdef_theme_space_clip(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Strips Selected", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "metadatabg", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "metadatabg");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Metadata Background", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "metadatatext", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "metadatatext");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Metadata Text", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
rna_def_userdef_theme_spaces_curves(srna, false, false, false, true);
}