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

Revert "Revert "Remove MTexPoly layers""

Browse Source 
I reverted this commit by mistake. Sorry :/

This reverts commit 9caf328a7cc55775b740ee4beecf8a77f47d3986.
This commit is contained in:
Clément Foucault 2017-05-30 01:29:03 +02:00
parent 5773f58762
commit d321ed62b8
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenloader/intern/versioning_280.c
View File

@ -33,15 +33,18 @@
#include "DNA_gpu_types.h" #include "DNA_gpu_types.h"
#include "DNA_layer_types.h" #include "DNA_layer_types.h"
#include "DNA_material_types.h" #include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_screen_types.h" #include "DNA_screen_types.h"
#include "DNA_genfile.h" #include "DNA_genfile.h"
#include "BKE_blender.h" #include "BKE_blender.h"
#include "BKE_collection.h" #include "BKE_collection.h"
#include "BKE_customdata.h"
#include "BKE_idprop.h" #include "BKE_idprop.h"
#include "BKE_layer.h" #include "BKE_layer.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BKE_mesh.h"
#include "BKE_scene.h" #include "BKE_scene.h"
#include "BLI_listbase.h" #include "BLI_listbase.h"
@ -273,4 +276,17 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
} }
} }
} }
/* MTexPoly now removed. */
if (DNA_struct_find(fd->filesdna, "MTexPoly")) {
const int cd_mtexpoly = 15; /* CD_MTEXPOLY, deprecated */
for (Mesh *me = main->mesh.first; me; me = me->id.next) {
/* If we have UV's, so this file will have MTexPoly layers too! */
if (me->mloopuv != NULL) {
CustomData_update_typemap(&me->pdata);
CustomData_free_layers(&me->pdata, cd_mtexpoly, me->totpoly);
BKE_mesh_update_customdata_pointers(me, false);
}
}
}
} }