- 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.

source/blender/blenkernel/intern/anim.c

@@ -46,6 +46,7 @@
 #include "DNA_view3d_types.h"
 #include "DNA_effect_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_global.h"

source/blender/blenkernel/intern/armature.c

@@ -42,6 +42,7 @@
 #include "BLI_blenlib.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_action_types.h"
 #include "DNA_object_types.h"

source/blender/blenkernel/intern/displist.c

@@ -55,6 +55,7 @@
 #include "DNA_lamp_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_image_types.h"
 #include "DNA_material_types.h"

source/blender/blenkernel/intern/effect.c

@@ -40,6 +40,7 @@
 #include "DNA_effect_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_material_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"

source/blender/blenkernel/intern/exotic.c

@@ -93,6 +93,7 @@
 
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_material_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_curve_types.h"

source/blender/blenkernel/intern/key.c

@@ -41,6 +41,7 @@
 #include "DNA_key_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_lattice_types.h"

source/blender/blenkernel/intern/lattice.c

@@ -45,6 +45,7 @@
 
 #include "DNA_armature_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_lattice_types.h"

source/blender/blenkernel/intern/material.c

@@ -39,6 +39,7 @@
 #include "DNA_material_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_meta_types.h"

source/blender/blenkernel/intern/mesh.c

@@ -56,6 +56,7 @@
 #include "DNA_image_types.h"
 #include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 
 #include "BKE_main.h"
 #include "BKE_global.h"

source/blender/blenkernel/intern/object.c

@@ -57,6 +57,7 @@
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"

source/blender/blenkernel/intern/subsurf.c

@@ -49,6 +49,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_bad_level_calls.h"

source/blender/blenloader/intern/readfile.c

@@ -78,6 +78,7 @@
 #include "DNA_world_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_image_types.h"
 #include "DNA_material_types.h"
 #include "DNA_curve_types.h"

source/blender/blenloader/intern/writefile.c

@@ -115,6 +115,7 @@ Important to know is that 'streaming' has been added to files, for Blender Publi
 #include "DNA_camera_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_material_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_armature_types.h"

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;
 

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

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"

source/blender/python/api2_2x/NMesh.h

@@ -42,6 +42,7 @@
 #endif
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_key_types.h"
 #include "DNA_listBase.h"
 #include "DNA_object_types.h"

source/blender/radiosity/intern/source/radpostprocess.c

@@ -59,6 +59,7 @@
 
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_radio_types.h"
 

source/blender/radiosity/intern/source/radpreprocess.c

@@ -51,6 +51,7 @@
 #include "BLI_arithb.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"

source/blender/renderconverter/intern/convertBlenderScene.c

@@ -64,6 +64,7 @@
 #include "DNA_object_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_space_types.h"
 

source/blender/src/booleanops.c

@@ -39,6 +39,7 @@
 
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 

source/blender/src/buttons_editing.c

@@ -66,6 +66,7 @@
 #include "DNA_material_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_radio_types.h"
 #include "DNA_screen_types.h"

source/blender/src/buttons_object.c

@@ -95,6 +95,7 @@
 #include "DNA_material_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_radio_types.h"
 #include "DNA_screen_types.h"

source/blender/src/drawimage.c

@@ -51,6 +51,7 @@
 
 #include "DNA_image_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_packedFile_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"

source/blender/src/drawmesh.c

@@ -52,6 +52,7 @@
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_property_types.h"
 #include "DNA_scene_types.h"

source/blender/src/drawobject.c

@@ -58,6 +58,7 @@
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
 #include "DNA_space_types.h"

source/blender/src/editarmature.c

@@ -51,6 +51,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"

source/blender/src/editdeform.c

@@ -36,6 +36,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_blenlib.h"

source/blender/src/editface.c

@@ -53,6 +53,7 @@
 
 #include "DNA_image_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_space_types.h"
 #include "DNA_screen_types.h"

source/blender/src/editkey.c

@@ -51,6 +51,7 @@
 #include "DNA_ipo_types.h"
 #include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"

source/blender/src/editmesh.c

@@ -51,6 +51,7 @@
 #include "MTC_matrixops.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_key_types.h"

source/blender/src/editobject.c

@@ -67,6 +67,7 @@
 #include "DNA_lamp_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

source/blender/src/editsima.c

@@ -51,6 +51,7 @@
 #include "IMB_imbuf_types.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"

source/blender/src/vpaint.c

@@ -53,6 +53,7 @@
 #include "MTC_matrixops.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_scene_types.h"

source/gameengine/BlenderRoutines/KX_BlenderGL.cpp

@@ -56,6 +56,7 @@
 #include "DNA_camera_types.h"
 #include "DNA_world_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_image_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_material_types.h"

source/gameengine/Converter/BL_BlenderDataConversion.cpp

@@ -115,6 +115,7 @@
 #include "DNA_controller_types.h"
 #include "DNA_actuator_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 #include "DNA_sound_types.h"

source/gameengine/Converter/BL_MeshDeformer.cpp

@@ -45,6 +45,7 @@
 #include "BL_MeshDeformer.h"
 #include "BL_SkinMeshObject.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "BLI_arithb.h"
 
 #include "GEN_Map.h"

source/gameengine/Converter/BL_SkinDeformer.cpp

@@ -48,6 +48,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_action_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "BKE_armature.h"
 #include "BKE_action.h"
 #include "MT_Point3.h"

source/gameengine/Converter/BL_SkinDeformer.h

@@ -41,6 +41,7 @@
 #include "BL_ArmatureObject.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "BKE_armature.h"
 

source/gameengine/Converter/BL_SkinMeshObject.cpp

@@ -42,6 +42,7 @@
 #include "BL_SkinMeshObject.h"
 #include "BL_DeformableGameObject.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "KX_GameObject.h"
 #include "RAS_BucketManager.h"
 

source/gameengine/Converter/BL_SkinMeshObject.h

@@ -44,6 +44,7 @@
 #include "BL_MeshDeformer.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 
 typedef vector<struct MVert*> BL_MVertArray;
 typedef vector<struct MDeformVert*> BL_DeformVertArray;

source/gameengine/Converter/BlenderWorldInfo.cpp

@@ -57,6 +57,7 @@
 #include "DNA_controller_types.h"
 #include "DNA_actuator_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 #include "DNA_screen_types.h"

source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp

@@ -52,6 +52,7 @@
 #include "DNA_controller_types.h"
 #include "DNA_actuator_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 

source/gameengine/GamePlayer/common/GPC_RenderTools.cpp

@@ -81,6 +81,7 @@
 #include "DNA_controller_types.h"
 #include "DNA_actuator_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"