[Bf-blender-cvs] [61bffa565ec] master: Fix T90412: Inconsistency in mask strip color

[Richard Antalik]

Commit: 61bffa565ec2b43b6131f6e459b7c07970b8a5db
Author: Richard Antalik
Date:   Wed Nov 17 03:27:13 2021 +0100
Branches: master
https://developer.blender.org/rB61bffa565ec2b43b6131f6e459b7c07970b8a5db

Fix T90412: Inconsistency in mask strip color

This seems to be oversight in 271231f58ee3 where strip color was
defined only for light theme.

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

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

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

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index da01f65131c..055a2e37c6c 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -647,7 +647,7 @@ const bTheme U_theme_default = {
     .facedot_size = 4,
     .movie = RGBA(0x4d6890ff),
     .movieclip = RGBA(0x8f4c4cff),
-    .mask = RGBA(0x666666ff),
+    .mask = RGBA(0x8f5656ff),
     .image = RGBA(0x8f744bff),
     .scene = RGBA(0x808033ff),
     .audio = RGBA(0x448080ff),
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 00934ef2002..43784b5a856 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -39,7 +39,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 1
+#define BLENDER_FILE_SUBVERSION 2
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the file
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 2d5d6479234..0e5e0b76f43 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -334,6 +334,9 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
     memcpy(btheme, &U_theme_default, sizeof(*btheme));
   }
 
+  if (!USER_VERSION_ATLEAST(301, 2)) {
+    FROM_DEFAULT_V4_UCHAR(space_sequencer.mask);
+  }
   /**
    * Versioning code until next subversion bump goes here.
    *