[Bf-blender-cvs] [cef41d0144e] blender2.8: Fix T59496: Movie Clip Editor does not display metadata

[Sergey Sharybin]

Commit: cef41d0144e842aa4983945ce3df764038dd22f5
Author: Sergey Sharybin
Date:   Tue Dec 18 12:27:46 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBcef41d0144e842aa4983945ce3df764038dd22f5

Fix T59496: Movie Clip Editor does not display metadata

===================================================================

M       release/datafiles/userdef/userdef_default_theme.c
M       source/blender/blenkernel/BKE_blender_version.h
M       source/blender/blenloader/intern/versioning_userdef.c
M       source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/release/datafiles/userdef/userdef_default_theme.c 
b/release/datafiles/userdef/userdef_default_theme.c
index 668cb29da3d..c0f6f2c1e45 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -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),
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index dd0803a3a67..2d044fd9399 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -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
diff --git a/source/blender/blenloader/intern/versioning_userdef.c 
b/source/blender/blenloader/intern/versioning_userdef.c
index 284201623b5..bb0ad9d3ce5 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -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
 }
 
diff --git a/source/blender/makesrna/intern/rna_userdef.c 
b/source/blender/makesrna/intern/rna_userdef.c
index 3025bc091f1..dcb8473a430 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -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);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs