Custom Menus : fix build error due to library updatesoc-2020-custom-menus

7 files changed, 3 insertions, 2 deletions

diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 2b3c19f5f61fc72dba56a7edfdc4e55e2327dc1
+Subproject 2a85baf7318e2d8a26a25e6eb8211a2395d44a7
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 49c39f59fbc464dd34388990123f271c39eacbf
+Subproject 5d33d1a1c2531e64bda78d46b517571f2b1e98e
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject a52733b58d95ce60ecde95a9eca242e7319c285
+Subproject f2f4a8b3bfa36ee49f7bdb3a1acb40ef4b39ee3
diff --git a/source/blender/blenkernel/BKE_blender_user_menu.h b/source/blender/blenkernel/BKE_blender_user_menu.h
index dd42d45fd67..6d653ed6f65 100644
--- a/source/blender/blenkernel/BKE_blender_user_menu.h
+++ b/source/blender/blenkernel/BKE_blender_user_menu.h
@@ -28,6 +28,7 @@ struct ListBase;
 struct bUserMenu;
 struct bUserMenuItem;
 struct wmWindowManager;
+struct bUserMenusGroup;
 
 void BKE_blender_user_menu_free_list(struct ListBase *lb);
 void BKE_blender_user_menus_group_idname_update(struct bUserMenusGroup *umg);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 241ae45ae5e..917955f6c60 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8909,7 +8909,7 @@ static void read_usermenuitems(BlendDataReader *reader,
     if (umi->type == USER_MENU_TYPE_OPERATOR) {
       bUserMenuItem_Op *umi_op = (bUserMenuItem_Op *)umi;
       BLO_read_data_address(reader, &umi_op->prop);
-      IDP_DirectLinkGroup_OrFree(&umi_op->prop, reader);
+      IDP_BlendDataRead(reader, &umi_op->prop);
     }
     if (umi->type == USER_MENU_TYPE_SUBMENU) {
       bUserMenuItem_SubMenu *umi_sm = (bUserMenuItem_SubMenu *)umi;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 15c6e25985b..667edef124b 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -987,7 +987,7 @@ static void write_usermenuitems(BlendWriter *writer, const ListBase *lb)
       const bUserMenuItem_Op *umi_op = (const bUserMenuItem_Op *)umi;
       BLO_write_struct(writer, bUserMenuItem_Op, umi_op);
       if (umi_op->prop) {
-        IDP_WriteProperty(umi_op->prop, writer);
+        IDP_BlendWrite(writer, umi_op->prop);
       }
     }
     else if (umi->type == USER_MENU_TYPE_MENU) {
diff --git a/source/tools b/source/tools
-Subproject 5cf2fc3e5dc28025394b57d8743401295528f31
+Subproject 6034199b444a1ae91a43dcb7b03144561b3e044