more changes from bmesh into trunk (mesh mpoly strict member)

1 files changed, 29 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index ca471bbabcd..f39095886da 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -49,6 +49,11 @@ struct MCol;
 struct MSticky;
 struct Mesh;
 struct OcInfo;
+struct MPoly;
+struct MTexPoly;
+struct MLoop;
+struct MLoopUV;
+struct MLoopCol;
 struct Multires;
 struct EditMesh;
 struct AnimData;
@@ -63,6 +68,17 @@ typedef struct Mesh {
 	struct Key *key;
 	struct Material **mat;
 
+#ifdef USE_BMESH_FORWARD_COMPAT
+/* BMESH ONLY */
+	/*new face structures*/
+	struct MPoly *mpoly;
+	struct MTexPoly *mtpoly;
+	struct MLoop *mloop;
+	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 */
 	struct TFace *tface;	/* depecrated, use mtface */
@@ -78,8 +94,20 @@ typedef struct Mesh {
 
 	struct CustomData vdata, edata, fdata;
 
+#ifdef USE_BMESH_FORWARD_COMPAT
+/* 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
+
 	/* 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
 	 * of the last selected face and is similar to the old active face flag where