[Bf-blender-cvs] [77ff9a20066] blender2.8: Keymap: remove loading keymaps from old files
Campbell Barton
noreply at git.blender.org
Fri Nov 16 02:31:09 CET 2018
Commit: 77ff9a2006607893032f709090ea17b944f16aff
Author: Campbell Barton
Date: Fri Nov 16 12:30:02 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB77ff9a2006607893032f709090ea17b944f16aff
Keymap: remove loading keymaps from old files
These keymaps are not going to work usefully in 2.8x,
remove support for loading them.
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/makesdna/DNA_userdef_types.h
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d3a128f34a3..4eea35ad89f 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8912,12 +8912,6 @@ static BHead *read_userdef(BlendFileData *bfd, FileData *fd, BHead *bhead)
/* read all data into fd->datamap */
bhead = read_data_into_oldnewmap(fd, bhead, "user def");
- if (user->keymaps.first) {
- /* backwards compatibility */
- user->user_keymaps= user->keymaps;
- user->keymaps.first= user->keymaps.last= NULL;
- }
-
link_list(fd, &user->themes);
link_list(fd, &user->user_keymaps);
link_list(fd, &user->user_menus);
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 512481a75b5..afff070946e 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -568,7 +568,6 @@ typedef struct UserDef {
struct ListBase themes;
struct ListBase uifonts;
struct ListBase uistyles;
- struct ListBase keymaps DNA_DEPRECATED; /* deprecated in favor of user_keymaps */
struct ListBase user_keymaps;
struct ListBase addons;
struct ListBase autoexec_paths;
More information about the Bf-blender-cvs
mailing list