[Bf-blender-cvs] [34e96f5] mesh-transfer-data: Some cleanup.
Bastien Montagne
noreply at git.blender.org
Tue Nov 4 22:12:23 CET 2014
Commit: 34e96f588da72e0c0f55c0f57a2541776c8f5a19
Author: Bastien Montagne
Date: Tue Nov 4 22:12:10 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB34e96f588da72e0c0f55c0f57a2541776c8f5a19
Some cleanup.
===================================================================
M source/blender/blenkernel/BKE_data_transfer.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/object/object_data_transfer.c
M source/blender/editors/object/object_intern.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h
index acc5c3d..ad6175e 100644
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_data_transfer.h
@@ -36,6 +36,10 @@
extern "C" {
#endif
+struct Object;
+struct Scene;
+struct SpaceTransform;
+
/* Warning, those def are stored in files (TransferData modifier), *DO NOT* modify those values. */
enum {
DT_DATA_MDEFORMVERT = 1 << 0,
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 4bfad4a..75616b9 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -28,7 +28,6 @@
* \ingroup bke
*/
-#include "DNA_customdata_types.h" /* needed for all enum typdefs */
#include "DNA_modifier_types.h" /* needed for all enum typdefs */
#include "BLI_compiler_attrs.h"
#include "BKE_customdata.h"
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 9811d42..e73bbfc 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -42,8 +42,6 @@ struct BPoint;
struct Base;
struct BezTriple;
struct Curve;
-struct CustomData;
-struct DerivedMesh;
struct EditBone;
struct EnumPropertyItem;
struct ID;
@@ -58,7 +56,6 @@ struct Nurb;
struct Object;
struct ReportList;
struct Scene;
-struct SpaceTransform;
struct View3D;
struct ViewContext;
struct bConstraint;
diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c
index 80e185c..8a22ca5 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -31,20 +31,15 @@
#include "MEM_guardedalloc.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_mesh_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "BLI_array.h"
#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
#include "BKE_context.h"
-#include "BKE_customdata.h"
#include "BKE_data_transfer.h"
-#include "BKE_deform.h"
#include "BKE_DerivedMesh.h"
#include "BKE_mesh_mapping.h"
#include "BKE_object.h"
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index 54ada0f..3905066 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -35,8 +35,6 @@ struct wmOperatorType;
struct KeyBlock;
struct Lattice;
struct Curve;
-struct CustomData;
-struct DataTransferLayerMapping;
struct Object;
struct Mesh;
struct HookModifierData;
More information about the Bf-blender-cvs
mailing list