- split the data structures that actually constitute a mesh

    (MVert,MFace,etc) off into DNA_meshdata_types.h, to isolate areas
    of source that actually edit mesh *data* vs. areas that just edit
    mesh object information.

3 files changed, 71 insertions, 37 deletions

diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 74f5d388723..ebfa3818ef8 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -43,13 +43,6 @@ struct MCol;
 struct MSticky;
 struct Mesh;
 struct OcInfo;
-struct bDeformGroup;
-
-typedef struct MFace {
-	unsigned int v1, v2, v3, v4;
-	char puno, mat_nr;
-	char edcode, flag;
-} MFace;
 
 typedef struct TFace {
 
@@ -62,36 +55,6 @@ typedef struct TFace {
 	short mode, tile, pad;
 } TFace;
 
-typedef struct MDeformWeight {	/* __NLA */
-	int				def_nr;		/* __NLA */
-	float			weight;		/* __NLA */
-	struct Bone		*data;		/* __NLA */	/* Runtime: Does not need to be valid in file */
-} MDeformWeight;				/* __NLA */
-
-typedef struct MDeformVert {	/* __NLA */
-	struct MDeformWeight *dw;	/* __NLA */
-	int totweight;				/* __NLA */
-	int reserved1;				/* __NLA */	
-} MDeformVert;					/* __NLA */
-
-
-typedef struct MVert {
-	float	co[3];
-	short	no[3];
-	char flag, mat_nr;
-} MVert;
-
-
-typedef struct MCol {
-	char a, r, g, b;
-} MCol;
-
-
-typedef struct MSticky {
-	float co[2];
-} MSticky;
-
-
 typedef struct Mesh {
 	ID id;
 
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
new file mode 100644
index 00000000000..5eaba97fc63
--- /dev/null
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -0,0 +1,69 @@
+/**
+ * $Id$ 
+ *
+ * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ */
+#ifndef DNA_MESHDATA_TYPES_H
+#define DNA_MESHDATA_TYPES_H
+
+struct Bone;
+
+typedef struct MFace {
+	unsigned int v1, v2, v3, v4;
+	char puno, mat_nr;
+	char edcode, flag;
+} MFace;
+
+typedef struct MDeformWeight {
+	int				def_nr;
+	float			weight;
+	struct Bone		*data;		/* Runtime: Does not need to be valid in file */
+} MDeformWeight;
+
+typedef struct MDeformVert {
+	struct MDeformWeight *dw;
+	int totweight;
+	int reserved1;
+} MDeformVert;
+
+typedef struct MVert {
+	float	co[3];
+	short	no[3];
+	char flag, mat_nr;
+} MVert;
+
+typedef struct MCol {
+	char a, r, g, b;
+} MCol;
+
+typedef struct MSticky {
+	float co[2];
+} MSticky;
+
+#endif
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 5f3673e95c7..fab4f72a1ad 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -92,6 +92,7 @@ char *includefiles[] = {
 	"DNA_meta_types.h",
 	"DNA_curve_types.h",
 	"DNA_mesh_types.h",
+	"DNA_meshdata_types.h",
 	"DNA_lattice_types.h",	
 	"DNA_object_types.h",
 	"DNA_world_types.h",
@@ -1097,6 +1098,7 @@ int main(int argc, char ** argv)
 #include "DNA_meta_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_lattice_types.h"	
 #include "DNA_object_types.h"
 #include "DNA_world_types.h"