From 6f9f1399a01d38e1f77f6e0bcc1c30d3e6436094 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 25 Mar 2013 22:40:11 +0000 Subject: code cleanup: operator headers --- source/blender/bmesh/intern/bmesh_opdefines.c | 2 +- source/blender/bmesh/intern/bmesh_private.h | 1 - source/blender/bmesh/operators/bmo_beautify.c | 2 +- source/blender/bmesh/operators/bmo_dissolve.c | 3 +-- source/blender/bmesh/operators/bmo_hull.c | 3 --- source/blender/bmesh/operators/bmo_mesh_conv.c | 14 +------------- source/blender/bmesh/operators/bmo_primitive.c | 3 +-- source/blender/bmesh/operators/bmo_removedoubles.c | 3 +-- source/blender/bmesh/operators/bmo_smooth_laplacian.c | 7 ------- source/blender/bmesh/operators/bmo_subdivide.c | 3 +-- source/blender/bmesh/operators/bmo_triangulate.c | 2 +- 11 files changed, 8 insertions(+), 35 deletions(-) diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 7e3ee9d249e..869c894b66c 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -57,7 +57,7 @@ #include "BLI_utildefines.h" #include "bmesh.h" -#include "intern/bmesh_private.h" +#include "intern/bmesh_operators_private.h" /* The formatting of these bmesh operators is parsed by * 'doc/python_api/rst_from_bmesh_opdefines.py' diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h index 850e81ba3ac..6fd18c07179 100644 --- a/source/blender/bmesh/intern/bmesh_private.h +++ b/source/blender/bmesh/intern/bmesh_private.h @@ -77,6 +77,5 @@ void poly_rotate_plane(const float normal[3], float (*verts)[3], const int nvert /* include the rest of our private declarations */ #include "bmesh_structure.h" -#include "bmesh_operators_private.h" #endif /* __BMESH_PRIVATE_H__ */ diff --git a/source/blender/bmesh/operators/bmo_beautify.c b/source/blender/bmesh/operators/bmo_beautify.c index 47bc55eb260..7490e7e05df 100644 --- a/source/blender/bmesh/operators/bmo_beautify.c +++ b/source/blender/bmesh/operators/bmo_beautify.c @@ -27,7 +27,7 @@ #include "BLI_math.h" #include "bmesh.h" -#include "intern/bmesh_private.h" +#include "intern/bmesh_operators_private.h" #define ELE_NEW 1 diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index a78a8ec5197..4a241ca645f 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -30,9 +30,8 @@ #include "BLI_math.h" #include "bmesh.h" -#include "intern/bmesh_private.h" +#include "intern/bmesh_operators_private.h" -#include "intern/bmesh_operators_private.h" /* own include */ #define FACE_MARK 1 #define FACE_ORIG 2 diff --git a/source/blender/bmesh/operators/bmo_hull.c b/source/blender/bmesh/operators/bmo_hull.c index 7dc2884c5ed..810b608b28e 100644 --- a/source/blender/bmesh/operators/bmo_hull.c +++ b/source/blender/bmesh/operators/bmo_hull.c @@ -28,9 +28,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_array.h" -#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" @@ -38,7 +36,6 @@ /* XXX: using 128 for totelem and pchunk of mempool, no idea what good * values would be though */ -#include "BLI_mempool.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 0976c4cdfbb..a75d0353079 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -28,28 +28,16 @@ * into a Bmesh, and back again. */ -#include "MEM_guardedalloc.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_key_types.h" -#include "DNA_modifier_types.h" #include "BLI_math.h" -#include "BLI_array.h" - -#include "BKE_mesh.h" -#include "BLI_listbase.h" -#include "BKE_global.h" -#include "BKE_key.h" -#include "BKE_main.h" -#include "BKE_customdata.h" #include "bmesh.h" -#include "intern/bmesh_private.h" +#include "intern/bmesh_operators_private.h" -#include "intern/bmesh_operators_private.h" /* own include */ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) { diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index 011002718d3..10a48c1b78c 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -29,9 +29,8 @@ #include "BLI_math.h" #include "bmesh.h" -#include "intern/bmesh_private.h" +#include "intern/bmesh_operators_private.h" -#include "intern/bmesh_operators_private.h" /* own include */ /* ************************ primitives ******************* */ diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 8b65764fe1c..65b3267914f 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -32,9 +32,8 @@ #include "BKE_customdata.h" #include "bmesh.h" -#include "intern/bmesh_private.h" +#include "intern/bmesh_operators_private.h" -#include "intern/bmesh_operators_private.h" /* own include */ static void remdoubles_splitface(BMFace *f, BMesh *bm, BMOperator *op, BMOpSlot *slot_targetmap) { diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.c b/source/blender/bmesh/operators/bmo_smooth_laplacian.c index 6b91d5fded9..0c0a2c308ee 100644 --- a/source/blender/bmesh/operators/bmo_smooth_laplacian.c +++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.c @@ -26,16 +26,9 @@ #include "MEM_guardedalloc.h" -#include "DNA_meshdata_types.h" -#include "BLI_array.h" #include "BLI_math.h" -#include "BLI_math_geom.h" -#include "BLI_smallhash.h" -#include "BLI_heap.h" -#include "BKE_customdata.h" -#include "BKE_mesh.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 88e903c1651..9115ee882dd 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -33,12 +33,11 @@ #include "BKE_customdata.h" -#include "DNA_object_types.h" #include "bmesh.h" #include "intern/bmesh_private.h" +#include "intern/bmesh_operators_private.h" -#include "intern/bmesh_operators_private.h" /* own include */ typedef struct SubDParams { int numcuts; diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c index a8bf53a136f..29c3764045e 100644 --- a/source/blender/bmesh/operators/bmo_triangulate.c +++ b/source/blender/bmesh/operators/bmo_triangulate.c @@ -32,7 +32,7 @@ #include "BLI_scanfill.h" #include "bmesh.h" -#include "intern/bmesh_private.h" +#include "intern/bmesh_operators_private.h" #define ELE_NEW 1 -- cgit v1.2.3