[Bf-blender-cvs] [d321ed62b8a] blender2.8: Revert "Revert "Remove MTexPoly layers""

[Clément Foucault]

Commit: d321ed62b8a5d0e9f82c2d7a3229b35a42c49e6d
Author: Clément Foucault
Date:   Tue May 30 01:29:03 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBd321ed62b8a5d0e9f82c2d7a3229b35a42c49e6d

Revert "Revert "Remove MTexPoly layers""

I reverted this commit by mistake. Sorry :/

This reverts commit 9caf328a7cc55775b740ee4beecf8a77f47d3986.

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

M	source/blender/blenloader/intern/versioning_280.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index ea7a6316466..672f712d861 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -33,15 +33,18 @@
 #include "DNA_gpu_types.h"
 #include "DNA_layer_types.h"
 #include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_genfile.h"
 
 #include "BKE_blender.h"
 #include "BKE_collection.h"
+#include "BKE_customdata.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
+#include "BKE_mesh.h"
 #include "BKE_scene.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);
+			}
+		}
+	}
 }