[Bf-blender-cvs] [c6e92b49479] blender2.8: Remove MTexPoly layers

Campbell Barton noreply at git.blender.org
Fri May 26 12:59:58 CEST 2017


Commit: c6e92b4947945e3c1238d936f7954a5b4688c195
Author: Campbell Barton
Date:   Fri May 26 20:58:57 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBc6e92b4947945e3c1238d936f7954a5b4688c195

Remove MTexPoly layers

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

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..808984c88a0 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -33,12 +33,14 @@
 #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"
@@ -273,4 +275,15 @@ 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_free_layers(&me->pdata, cd_mtexpoly, me->totpoly);
+			}
+		}
+	}
 }




More information about the Bf-blender-cvs mailing list