Fix T59496: Movie Clip Editor does not display metadata
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 18 Dec 2018 11:27:46 +0000 (12:27 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 18 Dec 2018 11:28:44 +0000 (12:28 +0100)
release/datafiles/userdef/userdef_default_theme.c
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenloader/intern/versioning_userdef.c
source/blender/makesrna/intern/rna_userdef.c

index 668cb29da3d97b39a62890f61ec404a49473ab8a..c0f6f2c1e45e3cc41e518259d6230351320b38aa 100644 (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),
index dd0803a3a676fbac23c6a92676fefb622f8c0c3d..2d044fd9399f03250b9753bb09025f494e30c9c6 100644 (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
index 284201623b52a9cdaac35adc73e83ce80ebb5386..bb0ad9d3ce55a97bb40017480c5efcc95adf62bd 100644 (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
 }
 
index 3025bc091f13006621a7e182154ce6bcd0bb6169..dcb8473a430f1ff0e9bc1b3190fce236228342ca 100644 (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);
 }