Multiple UV and vertex color layers: (still work in progress)

These can be created and deleted in the Mesh panel in the same place as
before. There is always one active UV and vertex color layer, that is
edited and displayed.

Important things to do:
- Render engine, material support
- Multires and NMesh now lose non active layers

Also CustomData changes to support muliple layers of the same type, and
changes to layer allocation, updated documentation is here:
http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData

1 files changed, 7 insertions, 4 deletions

diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c
index 7d07b3f89d5..1a97a3d594f 100644
--- a/source/blender/src/meshtools.c
+++ b/source/blender/src/meshtools.c
@@ -255,14 +255,17 @@ int join_mesh(void)
 	memset(&edata, 0, sizeof(edata));
 	memset(&fdata, 0, sizeof(fdata));
 	
-	mvertmain= mvert= CustomData_add_layer(&vdata, CD_MVERT, 0, NULL, totvert);
-	medgemain= medge= CustomData_add_layer(&edata, CD_MEDGE, 0, NULL, totedge);
-	mfacemain= mface= CustomData_add_layer(&fdata, CD_MFACE, 0, NULL, totface);
+	mvert= CustomData_add_layer(&vdata, CD_MVERT, CD_CALLOC, NULL, totvert);
+	medge= CustomData_add_layer(&edata, CD_MEDGE, CD_CALLOC, NULL, totedge);
+	mface= CustomData_add_layer(&fdata, CD_MFACE, CD_CALLOC, NULL, totface);
 
+	mvertmain= mvert;
+	medgemain= medge;
+	mfacemain= mface;
 
 	/* inverse transorm all selected meshes in this object */
 	Mat4Invert(imat, ob->obmat);
-	
+
 	vertofs= 0;
 	edgeofs= 0;
 	faceofs= 0;