diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-12-13 00:29:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-12-13 00:29:09 +0300 |
| commit | 80ee52e444f05a6fd7a45f2ddfe72720648fbab8 (patch) | |
| tree | 577238b0fdb738813ca560f0c5fc08dd6b945956 /source/blender/blenkernel/intern/exotic.c | |
| parent | 47adee414c7848f6ad898e9029205e804b9d6601 (diff) | |
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
Diffstat (limited to 'source/blender/blenkernel/intern/exotic.c')
| -rw-r--r-- | source/blender/blenkernel/intern/exotic.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index 4946066e4b3..40c876d1d16 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -300,9 +300,9 @@ static void read_stl_mesh_binary(char *str) me= ob->data; me->totvert = totvert; me->totface = totface; - me->mvert = CustomData_add_layer(&me->vdata, CD_MVERT, 0, + me->mvert = CustomData_add_layer(&me->vdata, CD_MVERT, CD_ASSIGN, vertdata, totvert); - me->mface = CustomData_add_layer(&me->fdata, CD_MFACE, 0, + me->mface = CustomData_add_layer(&me->fdata, CD_MFACE, CD_ASSIGN, facedata, totface); mesh_add_normals_flags(me); @@ -444,9 +444,9 @@ static void read_stl_mesh_ascii(char *str) me->totface = totface; me->totvert = totvert; - me->mvert = CustomData_add_layer(&me->vdata, CD_MVERT, 0, + me->mvert = CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, totvert); - me->mface = CustomData_add_layer(&me->fdata, CD_MFACE, 0, + me->mface = CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, totface); /* Copy vert coords and create topology */ @@ -563,9 +563,9 @@ static void read_videoscape_mesh(char *str) me->totvert= verts; me->totface= totedge+tottria+totquad; - me->mvert= CustomData_add_layer(&me->vdata, CD_MVERT, 0, + me->mvert= CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, me->totvert); - me->mface= CustomData_add_layer(&me->fdata, CD_MFACE, 0, + me->mface= CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface); /* colors */ @@ -770,9 +770,9 @@ static void read_radiogour(char *str) me->totface= totedge+tottria+totquad; me->flag= 0; - me->mvert= CustomData_add_layer(&me->vdata, CD_MVERT, 0, + me->mvert= CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, me->totvert); - me->mface= CustomData_add_layer(&me->fdata, CD_MFACE, 0, + me->mface= CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface); /* verts */ @@ -2067,9 +2067,9 @@ static void displist_to_mesh(DispList *dlfirst) me->totvert= totvert; me->totface= totface; - me->mvert= CustomData_add_layer(&me->vdata, CD_MVERT, 0, + me->mvert= CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, me->totvert); - me->mface= CustomData_add_layer(&me->fdata, CD_MFACE, 0, + me->mface= CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface); maxvertidx= totvert-1; @@ -3640,8 +3640,8 @@ static void dxf_get_mesh(Mesh** m, Object** o, int noob) } me->totvert=0; me->totface=0; - me->mvert= CustomData_add_layer(&me->vdata, CD_MVERT, 0, NULL, 0); - me->mface= CustomData_add_layer(&me->fdata, CD_MFACE, 0, NULL, 0); + me->mvert= CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, 0); + me->mface= CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, 0); } static void dxf_read_point(int noob) { |