kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T44577: writing tessellated cddata when we should not...

Browse Source 
Own mistake in rBf75c89b3f42ffac51603e6e53459f9d94a8782cc...
This commit is contained in:
Bastien Montagne 2015-05-01 16:11:55 +02:00
parent 535e75ea90
commit f84135ee65
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/writefile.c
View File

@ -2008,7 +2008,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);
@ -2030,7 +2032,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);