[Bf-blender-cvs] [dd95a2e1d5a] master: Cleanup: remove redundant theme versioning
Campbell Barton
noreply at git.blender.org
Fri Oct 2 13:00:27 CEST 2020
Commit: dd95a2e1d5aefc710bc9cd49f6acd0d49c80ef18
Author: Campbell Barton
Date: Fri Oct 2 20:58:43 2020 +1000
Branches: master
https://developer.blender.org/rBdd95a2e1d5aefc710bc9cd49f6acd0d49c80ef18
Cleanup: remove redundant theme versioning
All themes older than 2.8x are initialized from the defaults,
there is no need to version them.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 7321d680537..0b247d9a249 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6887,22 +6887,12 @@ static void link_global(FileData *fd, BlendFileData *bfd)
/* other initializers (such as theme color defaults) go to resources.c */
static void do_versions_userdef(FileData *fd, BlendFileData *bfd)
{
- Main *bmain = bfd->main;
UserDef *user = bfd->user;
if (user == NULL) {
return;
}
- if (MAIN_VERSION_OLDER(bmain, 266, 4)) {
- /* Themes for Node and Sequence editor were not using grid color,
- * but back. we copy this over then. */
- LISTBASE_FOREACH (bTheme *, btheme, &user->themes) {
- copy_v4_v4_uchar(btheme->space_node.grid, btheme->space_node.back);
- copy_v4_v4_uchar(btheme->space_sequencer.grid, btheme->space_sequencer.back);
- }
- }
-
if (!DNA_struct_elem_find(fd->filesdna, "UserDef", "WalkNavigation", "walk_navigation")) {
user->walk_navigation.mouse_speed = 1.0f;
user->walk_navigation.walk_speed = 2.5f; /* m/s */
More information about the Bf-blender-cvs
mailing list