diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2019-07-04 22:02:54 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2019-07-04 22:02:54 +0300 |
| commit | 12283cdec84c83cc6c33c2a8ae010c74575ead64 (patch) | |
| tree | 5d71cdae7640ea6cf9d9aa773db703e8fdf0e96b /source/blender/blenloader/intern/versioning_280.c | |
| parent | 7a78c32b58f04dd613f08166bb361e772efbd78b (diff) | |
| parent | 2740bdfff9f38807301fb3ee4d6a4949d8d8bb20 (diff) | |
Merge branch 'master' into soc-2019-outliner
Diffstat (limited to 'source/blender/blenloader/intern/versioning_280.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 1ee962ca035..a829a95f799 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1180,12 +1180,11 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* MTexPoly now removed. */ if (DNA_struct_find(fd->filesdna, "MTexPoly")) { - const int cd_mtexpoly = 15; /* CD_MTEXPOLY, deprecated */ for (Mesh *me = bmain->meshes.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); + CustomData_free_layers(&me->pdata, CD_MTEXPOLY, me->totpoly); BKE_mesh_update_customdata_pointers(me, false); } } |