mode bmesh include cleanup, remove unused file too.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 11 Feb 2012 10:15:11 +0000 (10:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 11 Feb 2012 10:15:11 +0000 (10:15 +0000)
32 files changed:
source/blender/blenkernel/intern/modifiers_bmesh.c
source/blender/bmesh/CMakeLists.txt
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_filters.c [deleted file]
source/blender/bmesh/intern/bmesh_iterators.c
source/blender/bmesh/intern/bmesh_marking.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/bmesh/intern/bmesh_mods.c
source/blender/bmesh/intern/bmesh_newcore.c
source/blender/bmesh/intern/bmesh_opdefines.c
source/blender/bmesh/intern/bmesh_operators.c
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/bmesh/intern/bmesh_private.h
source/blender/bmesh/intern/bmesh_queries.c
source/blender/bmesh/intern/bmesh_structure.c
source/blender/bmesh/intern/bmesh_walkers.c
source/blender/bmesh/intern/bmesh_walkers_impl.c
source/blender/bmesh/operators/bevel.c
source/blender/bmesh/operators/join_triangles.c
source/blender/bmesh/operators/mesh_conv.c
source/blender/bmesh/operators/mirror.c
source/blender/bmesh/operators/removedoubles.c
source/blender/bmesh/operators/subdivideop.c
source/blender/bmesh/operators/utils.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/bmeshutils.c
source/blender/editors/mesh/editbmesh_add.c
source/blender/editors/mesh/editbmesh_bvh.c
source/blender/modifiers/intern/MOD_array.c

index 43646c54acf6e389148fbb3ea7bae00cc60a22bd..e46d8dd8bceb8084bf5a1814bcc1d05a6e1574b0 100644 (file)
  *
  */
 
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-#include "ctype.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_math.h"
 
 #include "MEM_guardedalloc.h"
index 693c8cede787a65ece6fcd4e6a928c9b8a578c40..a432fa155c81fe073197b2d7ebecbbe3a8e24555 100644 (file)
@@ -95,7 +95,6 @@ set(SRC
        intern/bmesh_polygon.c
        intern/bmesh_queries.c
        intern/bmesh_opdefines.c
-       intern/bmesh_filters.c
        intern/bmesh_eulers.c
        intern/bmesh_operators.c
        intern/bmesh_private.h
index 35b8ef679345dde8d7918cd9b82cffd1b8cbd3db..80fe99703b1d7da7fc493b9e304995e3d5901606 100644 (file)
@@ -30,13 +30,12 @@ extern "C" {
 #endif
 
 #include "DNA_listBase.h"
-#include "DNA_scene_types.h"
 #include "DNA_customdata_types.h"
 
-#include "BKE_customdata.h"
-
 #include "BLI_utildefines.h"
 
+#include "bmesh_class.h"
+
 /*
  * short introduction:
  *
@@ -107,8 +106,6 @@ struct EditMesh;
 
 /* #define BM_NONORMCALC (1<<8) */ /* UNUSED */
 
-#include "bmesh_class.h"
-
 /* stub */
 void bmesh_error(void);
 
index ec4f528aabb43be608c0de860d0205ed39b24fbd..4fd0b99efe875511b8196268e95bf3495c1ff068 100644 (file)
 
 /*bmesh data structures*/
 
-#include "DNA_listBase.h"
-
-#include "BKE_utildefines.h"
-#include "BLI_utildefines.h"
-
 struct BMesh;
 struct BMVert;
 struct BMEdge;
index 9f6ebfe39ba0bfa9c4c3b0a54638b3daf30c0882..764bb62f09be636a051fd251a5d069260b1b66ff 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_customdata.h"
-#include "BKE_utildefines.h"
-
 #include "BLI_array.h"
-#include "BLI_utildefines.h"
+#include "BLI_math.h"
 
-#include "DNA_meshdata_types.h"
-#include "DNA_mesh_types.h"
+#include "BKE_customdata.h"
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
+#include "DNA_meshdata_types.h"
 
 #include "bmesh.h"
 #include "bmesh_private.h"
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
 #define SELECT 1
 
 /* prototypes */
diff --git a/source/blender/bmesh/intern/bmesh_filters.c b/source/blender/bmesh/intern/bmesh_filters.c
deleted file mode 100644 (file)
index 18a0df5..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * ***** BEGIN GPL 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.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor(s): Joseph Eagar, Geoffrey Bantle, Campbell Barton
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/bmesh/intern/bmesh_filters.c
- *  \ingroup bmesh
- *
- * BM Filter API. Not used yet.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "bmesh.h"
-#include "bmesh_private.h"
index 55d91620b899f3a1fcd3221355d41375409db31d..0603a4983541e7ac9466dbbdea8de151024d9914 100644 (file)
@@ -28,7 +28,6 @@
  * See: bmesh_iterators_inlin.c too, some functions are here for speed reasons.
  */
 
-#include <string.h>
 
 #include "bmesh.h"
 #include "bmesh_private.h"
index b3d29c036abf8ba4d5afb1330a5b9250876c187e..a052fbf4038b5086309f16bf415e3decec9ca81a 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_utildefines.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_math.h"
 #include "BLI_listbase.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
 
-#include <string.h>
 
 /*
  * BMESH SELECTMODE FLUSH
index 73117c607ea2f8e1f8844996f4ac6205bb20e1ec..5912979f9237bc14df73b61ea7eaec6a94cee6c0 100644 (file)
@@ -46,7 +46,6 @@
 
 #include "ED_mesh.h"
 
-#include "bmesh.h"
 #include "bmesh_private.h"
 
 /* bmesh_error stub */
index 8ed44918f58c376291a5d9cfdacdc6ea9ade6a3c..ae1252f8d584c186dbdd472333cee5267d5f7ccd 100644 (file)
  * the topology of existing mesh data. (split, join, flip etc).
  */
 
-#include <limits.h>
 #include "MEM_guardedalloc.h"
 
-#include "DNA_listBase.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_linklist.h"
-#include "BLI_ghash.h"
 #include "BLI_math.h"
 #include "BLI_array.h"
-#include "BLI_utildefines.h"
 #include "BLI_smallhash.h"
 
+#include "BKE_customdata.h"
+
 #include "bmesh.h"
 #include "bmesh_private.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 /**
  *                     bmesh_dissolve_disk
  *
index 7dcad13f77f9501b5fb36bfef526172d58ef1ba6..bd826c491e59271559d09bbc8487c940374f7c37 100644 (file)
 /** \file blender/bmesh/intern/bmesh_newcore.c
  *  \ingroup bmesh
  *
- * TODO
  */
 
 #include <limits.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_math_vector.h"
 
-#include "BKE_customdata.h"
 #include "BKE_DerivedMesh.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_listbase.h"
-#include "BLI_mempool.h"
-#include "BLI_ghash.h"
 #include "BLI_array.h"
 
-#include "MEM_guardedalloc.h"
-
-#include "DNA_listBase.h"
-
-#include "bmesh_class.h"
-
-#include "bmesh_iterators.h"
+#include "bmesh.h"
 #include "bmesh_private.h"
 
 /* use so valgrinds memcheck alerts us when undefined index is used.
index 02ac4174f69c4b3571f7cf53eb9737475f3e7e0d..f4700d28c4824365bf6aeaa0f60c5e0cfe4c33dc 100644 (file)
@@ -56,8 +56,6 @@
 
 #include "bmesh.h"
 #include "bmesh_private.h"
-#include <stdio.h>
-
 
 /* ok, I'm going to write a little docgen script. so all
  * bmop comments must conform to the following template/rules:
index b1f8b63662fb891ddad27dac9492a213c06d472a..caa3b5680d994529b153405e412274ba9d7889e2 100644 (file)
@@ -40,8 +40,6 @@
 #include "bmesh_private.h"
 #include "stdarg.h"
 
-#include <string.h>
-
 /* forward declarations */
 static void alloc_flag_layer(BMesh *bm);
 static void free_flag_layer(BMesh *bm);
index 987807e03500da296e5624282dfd8f5cdb1af118..62d6e8bf92859cdcb7f6af3506f3540923fb1390 100644 (file)
  *    degenerate faces.
  */
 
-#include <string.h>
-#include <math.h>
-#include <stdlib.h>
-
-#include "BKE_utildefines.h"
-
 #include "BLI_math.h"
 #include "BLI_array.h"
-#include "BLI_utildefines.h"
 
 #include "MEM_guardedalloc.h"
 
index df09ee060a524cc87a90dec36f95cead070d70b9..0a7d839967766c93c61ee7b299dee80ecee7d9cc 100644 (file)
@@ -36,7 +36,6 @@
 #ifndef BMESH_PRIVATE_H
 #define BMESH_PRIVATE_H
 
-#include "bmesh.h"
 struct Link;
 struct BMLoop;
 
index d0d5e09e1e4a0cb12a9ef7e9daff381fd17b4c3d..b2b9dd5a5fbe3e227156865c8ee12e205bc0cc8b 100644 (file)
  * of inspecting the mesh structure directly.
  */
 
-#include <string.h>
+#include "BLI_math.h"
 
 #include "bmesh.h"
 #include "bmesh_private.h"
 
-#include "BKE_utildefines.h"
-
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
 #define BM_OVERLAP (1 << 13)
 
 /*
index 149b8d90134c94aec66e32716f24351be8b15021..d2a54f2ea275f94d76413a305a0262fd369d9e69 100644 (file)
  * Low level routines for manipulating the BM structure.
  */
 
-#include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_listBase.h"
-#include "BKE_utildefines.h"
 #include "bmesh.h"
 #include "bmesh_private.h"
-#include "BLI_linklist.h"
-#include "BLI_ghash.h"
 
 /**
  *     MISC utility functions.
index e666a88583c421d760132acca27a33d7ca0eab0b..94ce7c2a5dd2254776eeccc747fc66cac14cb064 100644 (file)
  * BMesh Walker API.
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 
-#include "BKE_customdata.h"
 
-#include "DNA_meshdata_types.h"
-#include "DNA_mesh_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_listbase.h"
-#include "BLI_mempool.h"
-#include "BLI_array.h"
 
 #include "bmesh.h"
 
-#include "bmesh_private.h"
 #include "bmesh_walkers_private.h"
 
 /* - joeedh -
index aaa6575ca6e5f49307eba49d1ae75ba7de6ab9a9..6e5258e70df3b3cddc1bc64f608d3f241fe6fd5a 100644 (file)
  * BMesh Walker Code.
  */
 
-#include <stdio.h>
-#include <string.h>
-
 #include "BKE_customdata.h"
 
-#include "DNA_meshdata_types.h"
-#include "DNA_mesh_types.h"
-
-#include "BLI_utildefines.h"
-#include "BLI_mempool.h"
-#include "BLI_array.h"
-
 #include "bmesh.h"
-
 #include "bmesh_private.h"
 #include "bmesh_walkers_private.h"
 
index d208ec2ee14c5370879a5c172c3c482d3b085120..173fba15ee8d9b027bd03e3c214ee5d514cd79ed 100644 (file)
@@ -26,6 +26,8 @@
 #include "BLI_math.h"
 #include "BLI_smallhash.h"
 
+#include "BKE_customdata.h"
+
 #include "bmesh.h"
 
 #define BEVEL_FLAG     1
index 7873be21556e8a25de01415f11683ba95fde2735..50810ab083bd2944062aaa615e7bfebbee54354c 100644 (file)
@@ -25,7 +25,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
-#include "BKE_utildefines.h"
+#include "BKE_customdata.h"
 
 #include "BLI_math.h"
 #include "BLI_array.h"
index 8dc2bf34255ca4c4b1800eb57d5f82bb4643811b..59b6585096bfaf26037227f0209df6434e7a76ca 100644 (file)
@@ -34,6 +34,7 @@
 #include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_main.h"
+#include "BKE_customdata.h"
 
 #include "BLI_math.h"
 #include "BLI_array.h"
index 86be9e2c00b8513a94582ae75663297cd0dcf9a5..143c099348f956d475afd073249e3bfd079c9f3d 100644 (file)
 #include "BLI_array.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_customdata.h"
+
 #include "bmesh.h"
 #include "bmesh_operators_private.h" /* own include */
 
-/*
- * MIRROR.C
- *
- * mirror bmop.
- */
-
 #define ELE_NEW                1
 
 void bmesh_mirror_exec(BMesh *bm, BMOperator *op)
index ab77a78487cb22de8df09aaee597dc0ece3f3c93..7569710d62f89f18cc87f6c9d1d1fec79613006c 100644 (file)
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-
 #include "BLI_math.h"
 #include "BLI_array.h"
 
+#include "BKE_customdata.h"
+
 #include "bmesh.h"
 #include "bmesh_private.h"
 
index e813ca395a2dcfb7d08f1f93f39520f1dc964ea3..aa834fc3d921c9e0d8aba40d172bdc40cea78b6a 100644 (file)
@@ -29,6 +29,8 @@
 #include "BLI_array.h"
 #include "BLI_noise.h"
 
+#include "BKE_customdata.h"
+
 #include "DNA_object_types.h"
 
 #include "ED_mesh.h" /* XXX BAD LEVEL CALL */
index b680cb959f302c55015a419915328c2cd9587e7c..f6d6df824078c05bf03d05cab61d49d14c9147bc 100644 (file)
@@ -29,6 +29,8 @@
 #include "BLI_array.h"
 #include "BLI_heap.h"
 
+#include "BKE_customdata.h"
+
 #include "bmesh.h"
 
 #include "bmesh_operators_private.h" /* own include */
index 8370ee4ee48f34e3cc30ffcbbb48144bc76be00f..a75cece5248d4e434dc4166b7638e25e48cde01a 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-
 #include "MEM_guardedalloc.h"
 
-
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
@@ -46,7 +44,6 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
-
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -59,6 +56,7 @@
 
 #include "BIF_gl.h"
 
+#include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 
index f3ffcb40e81b8f92e8bee0f681b790c7c8aaabd9..bea82e1a15f3164e941e783702c31f81e28a1644 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
-
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
index aabbbfe8a3a1b90ee7fa8068cc48181b6d2b5f96..21e4cf0d7ecf98d89f0e19fb4cb294c545128711 100644 (file)
@@ -27,9 +27,8 @@
 
 #include "MEM_guardedalloc.h"
 
-
 #include "DNA_object_types.h"
-
+#include "DNA_scene_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BKE_report.h"
 #include "BKE_tessmesh.h"
 
-
-
 #include "WM_api.h"
 #include "WM_types.h"
 
 #include "ED_mesh.h"
 #include "ED_util.h"
 
-
-
 void EDBM_RecalcNormals(BMEditMesh *em)
 {
        BM_Compute_Normals(em->bm);
index 4d806ab02d3405a75a40944fb8b6b9229db8655f..d296009b64876513417577770a9aacd56feacbdf 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-
-
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
 #include "ED_screen.h"
 #include "ED_object.h"
 
-
-
-
-
 /* uses context to figure out transform for primitive */
 /* returns standard diameter */
 static float new_primitive_matrix(bContext *C, float *loc, float *rot, float primmat[][4])
index b1d68ea7a60d4a96f37ae68b3d9e5d67d7359164..7c7b1eb52e09172858b14baebb50809d3acde3ed 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "MEM_guardedalloc.h"
 
-
+#include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_tessmesh.h"
 
-
-
 #include "ED_mesh.h"
 #include "ED_view3d.h"
 
 
-
-
 typedef struct BMBVHTree {
        BMEditMesh *em;
        BMesh *bm;
index 06f65e06703d1171bf241b42c523bfe5f29447c9..5c020f69cd5d7867bb80c9e0e6847138ebfd4486 100644 (file)
@@ -46,6 +46,7 @@
 #include "DNA_curve_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_displist.h"