Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Craddock <nzcraddock@gmail.com>2020-11-17 00:19:11 +0300
committerNathan Craddock <nzcraddock@gmail.com>2020-11-17 00:19:11 +0300
commit09045ff64d1f0948489354bd097f2930f45bacb9 (patch)
tree9c259a8cbced35902f2153ccc020da05c3a57657 /source/blender
parent96200110eb0f0c8d2d48b1f383927ab8bd6c4aff (diff)
parent906ff7b8fea8ae077c3d3f39ae2c9a2be08b88e5 (diff)
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 7d7c68beb8f..5aa0e46aa46 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -257,6 +257,9 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
*/
{
/* Keep this block, even when empty. */
+ for (int i = 0; i < COLLECTION_COLOR_TOT; ++i) {
+ FROM_DEFAULT_V4_UCHAR(collection_color[i].color);
+ }
}
#undef FROM_DEFAULT_V4_UCHAR