[Bf-blender-cvs] [2081dac93b] blender2.8: Mesh batch caches should not be stored in file

Dalai Felinto noreply at git.blender.org
Fri Jan 27 15:21:23 CET 2017


Commit: 2081dac93be916a2204ffe1bef2514789a7f8842
Author: Dalai Felinto
Date:   Fri Jan 27 15:21:14 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB2081dac93be916a2204ffe1bef2514789a7f8842

Mesh batch caches should not be stored in file

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/writefile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 255625271e..b5dd1910f0 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4607,6 +4607,7 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh)
 
 	mesh->bb = NULL;
 	mesh->edit_btmesh = NULL;
+	mesh->batch_cache = NULL;
 	
 	/* happens with old files */
 	if (mesh->mselect == NULL) {
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 8ba36d149e..5011f9836b 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2270,6 +2270,7 @@ static void write_meshes(WriteData *wd, ListBase *idbase)
 				CustomData_reset(&mesh->pdata);
 				CustomData_reset(&mesh->ldata);
 				mesh->edit_btmesh = NULL;
+				mesh->batch_cache = NULL;
 
 				/* now fill in polys to mfaces */
 				/* XXX This breaks writing design, by using temp allocated memory, which will likely generate




More information about the Bf-blender-cvs mailing list