diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 05:40:04 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 05:40:04 +0400 |
| commit | 69289c978eace478bf992517473960d540895815 (patch) | |
| tree | 493d2c9bec32f761468b082fbbb015c748b71685 /source/blender/makesdna/DNA_mesh_types.h | |
| parent | 5f093d6a5867a365900158fcca71296852787aac (diff) | |
| parent | be674afdadaa1ab966147755e224e8bbda6807db (diff) | |
Merged changes in the trunk up to revision 44266 (including BMesh).
Freestyle edge/face marks were ported to BMesh.
Conflicts resolved:
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/blenkernel/intern/editderivedmesh.c
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index ea626b5221d..f422e80b864 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -69,7 +69,6 @@ typedef struct Mesh { struct Key *key; struct Material **mat; -/*#ifdef USE_BMESH_FORWARD_COMPAT*/ /* XXX - ifdefs dont work here! */ /* BMESH ONLY */ /*new face structures*/ struct MPoly *mpoly; @@ -78,36 +77,36 @@ typedef struct Mesh { struct MLoopUV *mloopuv; struct MLoopCol *mloopcol; /* END BMESH ONLY */ -/*#endif*/ - struct MFace *mface; /* array of mesh object mode faces */ - struct MTFace *mtface; /* store face UV's and texture here */ + /*mface stores the tesselation (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 TFace *tface; /* depecrated, use mtface */ struct MVert *mvert; /* array of verts */ struct MEdge *medge; /* array of edges */ struct MDeformVert *dvert; /* deformgroup vertices */ - struct MCol *mcol; /* array of colors, this must be the number of faces * 4 */ + + /* array of colors for the tesselated faces, must be number of tesselated + faces * 4 in length */ + struct MCol *mcol; struct MSticky *msticky; struct Mesh *texcomesh; struct MSelect *mselect; - struct EditMesh *edit_mesh; /* not saved in file! */ + struct BMEditMesh *edit_btmesh; /* not saved in file! */ struct CustomData vdata, edata, fdata; -/*#ifdef USE_BMESH_FORWARD_COMPAT*/ /* XXX - ifdefs dont work here! */ /* BMESH ONLY */ struct CustomData pdata, ldata; /* END BMESH ONLY */ -/*#endif*/ int totvert, totedge, totface, totselect; -/*#ifdef USE_BMESH_FORWARD_COMPAT*/ /* BMESH ONLY */ int totpoly, totloop; /* END BMESH ONLY */ -/*#endif*/ /* XXX - ifdefs dont work here! */ /* the last selected vertex/edge/face are used for the active face however * this means the active face must always be selected, this is to keep track @@ -229,9 +228,8 @@ typedef struct TFace { /* this is so we can save bmesh files that load in trunk, ignoring NGons * will eventually be removed */ -#if 0 /* enable in bmesh branch only for now */ #define USE_BMESH_SAVE_AS_COMPAT -#endif +#define USE_BMESH_SAVE_WITHOUT_MFACE #endif |