From aedf456938bf5611d8e1668599884ff3d957c643 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Sat, 20 Mar 2004 22:55:42 +0000 Subject: [PATCH] - 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 | 1 + source/blender/blenkernel/intern/armature.c | 1 + source/blender/blenkernel/intern/displist.c | 1 + source/blender/blenkernel/intern/effect.c | 1 + source/blender/blenkernel/intern/exotic.c | 1 + source/blender/blenkernel/intern/key.c | 1 + source/blender/blenkernel/intern/lattice.c | 1 + source/blender/blenkernel/intern/material.c | 1 + source/blender/blenkernel/intern/mesh.c | 1 + source/blender/blenkernel/intern/object.c | 1 + source/blender/blenkernel/intern/subsurf.c | 1 + source/blender/blenloader/intern/readfile.c | 1 + source/blender/blenloader/intern/writefile.c | 1 + source/blender/makesdna/DNA_mesh_types.h | 37 ---------- source/blender/makesdna/DNA_meshdata_types.h | 69 +++++++++++++++++++ source/blender/makesdna/intern/makesdna.c | 2 + source/blender/python/api2_2x/NMesh.h | 1 + .../radiosity/intern/source/radpostprocess.c | 1 + .../radiosity/intern/source/radpreprocess.c | 1 + .../intern/convertBlenderScene.c | 1 + source/blender/src/booleanops.c | 1 + source/blender/src/buttons_editing.c | 1 + source/blender/src/buttons_object.c | 1 + source/blender/src/drawimage.c | 1 + source/blender/src/drawmesh.c | 1 + source/blender/src/drawobject.c | 1 + source/blender/src/editarmature.c | 1 + source/blender/src/editdeform.c | 1 + source/blender/src/editface.c | 1 + source/blender/src/editkey.c | 1 + source/blender/src/editmesh.c | 1 + source/blender/src/editobject.c | 1 + source/blender/src/editsima.c | 1 + source/blender/src/vpaint.c | 1 + .../BlenderRoutines/KX_BlenderGL.cpp | 1 + .../Converter/BL_BlenderDataConversion.cpp | 1 + .../gameengine/Converter/BL_MeshDeformer.cpp | 1 + .../gameengine/Converter/BL_SkinDeformer.cpp | 1 + source/gameengine/Converter/BL_SkinDeformer.h | 1 + .../Converter/BL_SkinMeshObject.cpp | 1 + .../gameengine/Converter/BL_SkinMeshObject.h | 1 + .../gameengine/Converter/BlenderWorldInfo.cpp | 1 + .../GamePlayer/common/GPC_PolygonMaterial.cpp | 1 + .../GamePlayer/common/GPC_RenderTools.cpp | 1 + 44 files changed, 112 insertions(+), 37 deletions(-) create mode 100644 source/blender/makesdna/DNA_meshdata_types.h diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index ff4068e9511..d0a90c33350 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/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" diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index b16d2143edf..0588a13d251 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/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" diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 45fda288ac3..3159db7b5be 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/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" diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 5e04dd1eee4..22f7e524a15 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/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" diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index e1858198608..e3297509fc5 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/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" diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index b371fb498ae..c12af553df8 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/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" diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 96d022ef1f1..d32d5118a20 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/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" diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 81e66794963..9a61c9a2eaa 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 99a3574a617..9b9ae77531f 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/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" diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 0145f962142..85082c71c81 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/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" diff --git a/source/blender/blenkernel/intern/subsurf.c b/source/blender/blenkernel/intern/subsurf.c index db0ab4bc45d..d9f4d357989 100644 --- a/source/blender/blenkernel/intern/subsurf.c +++ b/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" diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 54b5f993b53..31e67e564e1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/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" diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index f7cce90ae5e..b7e510834aa 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/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" 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" diff --git a/source/blender/python/api2_2x/NMesh.h b/source/blender/python/api2_2x/NMesh.h index 8ec3378febd..499f9428700 100644 --- a/source/blender/python/api2_2x/NMesh.h +++ b/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" diff --git a/source/blender/radiosity/intern/source/radpostprocess.c b/source/blender/radiosity/intern/source/radpostprocess.c index a598b4de497..752eafcf890 100644 --- a/source/blender/radiosity/intern/source/radpostprocess.c +++ b/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" diff --git a/source/blender/radiosity/intern/source/radpreprocess.c b/source/blender/radiosity/intern/source/radpreprocess.c index 88b5afae359..9d418bff153 100644 --- a/source/blender/radiosity/intern/source/radpreprocess.c +++ b/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" diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index b14013ebb47..831288f1654 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/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" diff --git a/source/blender/src/booleanops.c b/source/blender/src/booleanops.c index 0c9febd31e9..2d6fe1b1f19 100644 --- a/source/blender/src/booleanops.c +++ b/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" diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 01bfde3c04e..503ebf3e510 100644 --- a/source/blender/src/buttons_editing.c +++ b/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" diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index b32027eb9a0..4e499ef3cb2 100644 --- a/source/blender/src/buttons_object.c +++ b/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" diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index 038bcb37159..fdf0def6fcd 100644 --- a/source/blender/src/drawimage.c +++ b/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" diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c index 1e851e0dedd..7799fb73dc0 100644 --- a/source/blender/src/drawmesh.c +++ b/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" diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 9e7656be8a3..ba813a469ae 100644 --- a/source/blender/src/drawobject.c +++ b/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" diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c index 5a7da8e6fb6..00b72acb0e4 100644 --- a/source/blender/src/editarmature.c +++ b/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" diff --git a/source/blender/src/editdeform.c b/source/blender/src/editdeform.c index 548fa053f75..d5882718d48 100644 --- a/source/blender/src/editdeform.c +++ b/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" diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c index f595bebd6e0..9a6f4f04ffe 100644 --- a/source/blender/src/editface.c +++ b/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" diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c index a918e3b8959..772dd0e62db 100644 --- a/source/blender/src/editkey.c +++ b/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" diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index bb0f2a79507..d88b990e19a 100644 --- a/source/blender/src/editmesh.c +++ b/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" diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index f850589fadd..63a0d409a77 100644 --- a/source/blender/src/editobject.c +++ b/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" diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c index 8b03c434424..2eb40ba0d2e 100644 --- a/source/blender/src/editsima.c +++ b/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" diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c index 47134631ddd..dedc9ca8c16 100644 --- a/source/blender/src/vpaint.c +++ b/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" diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index 92c2519c583..0c71845394b 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/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" diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 7dd42ef7d68..c1923bea2d9 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/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" diff --git a/source/gameengine/Converter/BL_MeshDeformer.cpp b/source/gameengine/Converter/BL_MeshDeformer.cpp index 000bc35b974..7608d98dd1f 100644 --- a/source/gameengine/Converter/BL_MeshDeformer.cpp +++ b/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" diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp index 81b789dd1ba..f25bf3bf728 100644 --- a/source/gameengine/Converter/BL_SkinDeformer.cpp +++ b/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" diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h index 25c3654d269..97d3d78073c 100644 --- a/source/gameengine/Converter/BL_SkinDeformer.h +++ b/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" diff --git a/source/gameengine/Converter/BL_SkinMeshObject.cpp b/source/gameengine/Converter/BL_SkinMeshObject.cpp index 2ed1a3a0d48..98a55662421 100644 --- a/source/gameengine/Converter/BL_SkinMeshObject.cpp +++ b/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" diff --git a/source/gameengine/Converter/BL_SkinMeshObject.h b/source/gameengine/Converter/BL_SkinMeshObject.h index 5dfca48af1e..40628bd4ee0 100644 --- a/source/gameengine/Converter/BL_SkinMeshObject.h +++ b/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 BL_MVertArray; typedef vector BL_DeformVertArray; diff --git a/source/gameengine/Converter/BlenderWorldInfo.cpp b/source/gameengine/Converter/BlenderWorldInfo.cpp index 59d7272b64a..b388af9ad8a 100644 --- a/source/gameengine/Converter/BlenderWorldInfo.cpp +++ b/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" diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp index b43dfee60a0..df34afac615 100644 --- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp +++ b/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" diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index 08db3719210..2c455f44b72 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/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"