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_meshdata_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_meshdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 53f9ff101a3..d7be7c0bff6 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -38,7 +38,7 @@ struct Bone; struct Image; -/*tesselation face, see MLoop/MPoly for the real face data*/ +/*tessellation face, see MLoop/MPoly for the real face data*/ typedef struct MFace { unsigned int v1, v2, v3, v4; short mat_nr; @@ -68,7 +68,7 @@ typedef struct MVert { char flag, bweight; } MVert; -/* tesselation vertex color data. +/* tessellation vertex color data. * at the moment alpha is abused for vertex painting * and not used for transparency, note that red and blue are swapped */ typedef struct MCol { @@ -76,7 +76,7 @@ typedef struct MCol { } MCol; /*new face structure, replaces MFace, which is now - only used for storing tesselations.*/ + only used for storing tessellations.*/ typedef struct MPoly { /* offset into loop array and number of loops in the face */ int loopstart; @@ -134,7 +134,7 @@ typedef struct MSelect { int type; /* EDITVERT/EDITEDGE/EDITFACE */ } MSelect; -/*tesselation uv face data*/ +/*tessellation uv face data*/ typedef struct MTFace { float uv[4][2]; struct Image *tpage; |