diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
| commit | 9e93fc1e8acacb99b4b7638590ca4f1491e8b587 (patch) | |
| tree | e42fb8ecc337a617a98e01f6c882b890ab9387e6 /source/blender/makesdna/DNA_mesh_types.h | |
| parent | 00782aae1f5f3159c7afb1cb227bd8de1bc4b9c4 (diff) | |
| parent | 95bba22af075148f9cbdb5a9b1ef41aeff1f560f (diff) | |
Merged changes in the trunk up to revision 44612.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index bb1f17010bb..be7ada5c5f1 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -77,10 +77,10 @@ typedef struct Mesh { struct MLoopCol *mloopcol; /* END BMESH ONLY */ - /*mface stores the tesselation (triangulation) of the mesh, + /*mface stores the tessellation (triangulation) of the mesh, real faces are now stored in nface.*/ - struct MFace *mface; /* array of mesh object mode faces for tesselation */ - struct MTFace *mtface; /* store tesselation face UV's and texture here */ + struct MFace *mface; /* array of mesh object mode faces for tessellation */ + struct MTFace *mtface; /* store tessellation face UV's and texture here */ struct TFace *tface; /* depecrated, use mtface */ struct MVert *mvert; /* array of verts */ struct MEdge *medge; /* array of edges */ |