Merge branch 'master' into gooseberry

2 files changed, 6 insertions, 2 deletions

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 44cc6b12a7d..0c2a4c4f097 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1006,7 +1006,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 	if (!MAIN_VERSION_ATLEAST(main, 274, 6)) {
 		bScreen *screen;
 
-		if (!DNA_struct_elem_find(fd->filesdna, "FileSelectParams", "int", "thumbnails_size")) {
+		if (!DNA_struct_elem_find(fd->filesdna, "FileSelectParams", "int", "thumbnail_size")) {
 			for (screen = main->screen.first; screen; screen = screen->id.next) {
 				ScrArea *sa;
 
@@ -1018,7 +1018,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 							SpaceFile *sfile = (SpaceFile *)sl;
 
 							if (sfile->params) {
-								sfile->params->thumbnails_size = 128;
+								sfile->params->thumbnail_size = 128;
 							}
 						}
 					}
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index c773f92c93b..2254c03bfd8 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2023,7 +2023,9 @@ static void write_meshes(WriteData *wd, ListBase *idbase)
 				 * If we do not do that, we can get crash by buffer-overflow on reading, see T44461. */
 				CustomData_copy(&old_mesh->vdata, &mesh->vdata, CD_MASK_EVERYTHING, CD_REFERENCE, mesh->totvert);
 				CustomData_copy(&old_mesh->edata, &mesh->edata, CD_MASK_EVERYTHING, CD_REFERENCE, mesh->totedge);
+#ifndef USE_BMESH_SAVE_WITHOUT_MFACE  /* Do not copy org fdata in this case!!! */
 				CustomData_copy(&old_mesh->fdata, &mesh->fdata, CD_MASK_EVERYTHING, CD_REFERENCE, mesh->totface);
+#endif
 				CustomData_copy(&old_mesh->ldata, &mesh->ldata, CD_MASK_EVERYTHING, CD_REFERENCE, mesh->totloop);
 				CustomData_copy(&old_mesh->pdata, &mesh->pdata, CD_MASK_EVERYTHING, CD_REFERENCE, mesh->totpoly);
 
@@ -2045,7 +2047,9 @@ static void write_meshes(WriteData *wd, ListBase *idbase)
 
 				CustomData_free(&mesh->vdata, mesh->totvert);
 				CustomData_free(&mesh->edata, mesh->totedge);
+#ifndef USE_BMESH_SAVE_WITHOUT_MFACE
 				CustomData_free(&mesh->fdata, mesh->totface);
+#endif
 				CustomData_free(&mesh->ldata, mesh->totloop);
 				CustomData_free(&mesh->pdata, mesh->totpoly);