[Bf-blender-cvs] [2772910b32d] soc-2020-custom-menus: Custom Menus : fix read file

[TempoDev]

Commit: 2772910b32d425738fe20a94fc488a3c3712b37d
Author: TempoDev
Date:   Sun Aug 16 22:30:55 2020 +0200
Branches: soc-2020-custom-menus
https://developer.blender.org/rB2772910b32d425738fe20a94fc488a3c3712b37d

Custom Menus : fix read file

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 575aa8bac2c..fb5ff800c9e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9827,11 +9827,9 @@ static BHead *read_userdef(BlendFileData *bfd, FileData *fd, BHead *bhead)
   }
 
   LISTBASE_FOREACH (bUserMenusGroup *, umg, &user->user_menus) {
-    BLI_listbase_clear(&umg->menus);
     BLO_read_list(reader, &umg->menus);
     BKE_blender_user_menus_group_idname_update(umg);
     LISTBASE_FOREACH (bUserMenu *, um, &umg->menus) {
-      BLI_listbase_clear(&um->items);
       BLO_read_list(reader, &um->items);
       read_usermenuitems(reader, &um->items, NULL);
     }
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 16f4a49328c..864a214c405 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1257,9 +1257,16 @@ static const EnumPropertyItem *rna_UserDef_usermenus_contexts_itemf(bContext *UN
                                                                     PropertyRNA *UNUSED(prop),
                                                                     bool *r_free)
 {
+  static const char *contexts_list[] = {
+      "mesh edit",           "curve edit",          "surface edit",        "text edit",
+      "armature edit",       "mball edit",          "lattice edit",        "pose mode",
+      "sculpt mode",         "weight paint",        "vertex paint",        "image paint",
+      "particle mode",       "object mode",         "greasepencil paint",  "greasepencil edit",
+      "greasepencil sculpt", "greasepencil weight", "greasepencil vertex", NULL,
+  };
+
   int totitem = 0;
   EnumPropertyItem *item = NULL;
-  const char **contexts_list = CTX_data_list_mode_string();
   int i;
 
   for (i = 0; contexts_list[i]; i++) {