diff options
32 files changed, 30 insertions, 166 deletions
diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index 43646c54acf..e46d8dd8bce 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -28,13 +28,7 @@ * */ -#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" diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 693c8cede78..a432fa155c8 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -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 diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 35b8ef67934..80fe99703b1 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -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); diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index ec4f528aabb..4fd0b99efe8 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -25,11 +25,6 @@ /*bmesh data structures*/ -#include "DNA_listBase.h" - -#include "BKE_utildefines.h" -#include "BLI_utildefines.h" - struct BMesh; struct BMVert; struct BMEdge; diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 9f6ebfe39ba..764bb62f09b 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -33,25 +33,16 @@ #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 index 18a0df58290..00000000000 --- a/source/blender/bmesh/intern/bmesh_filters.c +++ /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" diff --git a/source/blender/bmesh/intern/bmesh_iterators.c b/source/blender/bmesh/intern/bmesh_iterators.c index 55d91620b89..0603a498354 100644 --- a/source/blender/bmesh/intern/bmesh_iterators.c +++ b/source/blender/bmesh/intern/bmesh_iterators.c @@ -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" diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index b3d29c036ab..a052fbf4038 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -33,15 +33,13 @@ #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 diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 73117c607ea..5912979f923 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -46,7 +46,6 @@ #include "ED_mesh.h" -#include "bmesh.h" #include "bmesh_private.h" /* bmesh_error stub */ diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 8ed44918f58..ae1252f8d58 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -27,25 +27,18 @@ * 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 * diff --git a/source/blender/bmesh/intern/bmesh_newcore.c b/source/blender/bmesh/intern/bmesh_newcore.c index 7dcad13f77f..bd826c491e5 100644 --- a/source/blender/bmesh/intern/bmesh_newcore.c +++ b/source/blender/bmesh/intern/bmesh_newcore.c @@ -23,29 +23,20 @@ /** \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. diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 02ac4174f69..f4700d28c48 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -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: diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index b1f8b63662f..caa3b5680d9 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -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); diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 987807e0350..62d6e8bf928 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -35,15 +35,8 @@ * 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" diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h index df09ee060a5..0a7d8399677 100644 --- a/source/blender/bmesh/intern/bmesh_private.h +++ b/source/blender/bmesh/intern/bmesh_private.h @@ -36,7 +36,6 @@ #ifndef BMESH_PRIVATE_H #define BMESH_PRIVATE_H -#include "bmesh.h" struct Link; struct BMLoop; diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index d0d5e09e1e4..b2b9dd5a5fb 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -31,16 +31,11 @@ * 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) /* diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c index 149b8d90134..d2a54f2ea27 100644 --- a/source/blender/bmesh/intern/bmesh_structure.c +++ b/source/blender/bmesh/intern/bmesh_structure.c @@ -31,19 +31,8 @@ * 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. diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c index e666a88583c..94ce7c2a5dd 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.c +++ b/source/blender/bmesh/intern/bmesh_walkers.c @@ -26,23 +26,14 @@ * 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 - diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index aaa6575ca6e..6e5258e70df 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -26,20 +26,9 @@ * 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" diff --git a/source/blender/bmesh/operators/bevel.c b/source/blender/bmesh/operators/bevel.c index d208ec2ee14..173fba15ee8 100644 --- a/source/blender/bmesh/operators/bevel.c +++ b/source/blender/bmesh/operators/bevel.c @@ -26,6 +26,8 @@ #include "BLI_math.h" #include "BLI_smallhash.h" +#include "BKE_customdata.h" + #include "bmesh.h" #define BEVEL_FLAG 1 diff --git a/source/blender/bmesh/operators/join_triangles.c b/source/blender/bmesh/operators/join_triangles.c index 7873be21556..50810ab083b 100644 --- a/source/blender/bmesh/operators/join_triangles.c +++ b/source/blender/bmesh/operators/join_triangles.c @@ -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" diff --git a/source/blender/bmesh/operators/mesh_conv.c b/source/blender/bmesh/operators/mesh_conv.c index 8dc2bf34255..59b6585096b 100644 --- a/source/blender/bmesh/operators/mesh_conv.c +++ b/source/blender/bmesh/operators/mesh_conv.c @@ -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" diff --git a/source/blender/bmesh/operators/mirror.c b/source/blender/bmesh/operators/mirror.c index 86be9e2c00b..143c099348f 100644 --- a/source/blender/bmesh/operators/mirror.c +++ b/source/blender/bmesh/operators/mirror.c @@ -29,15 +29,11 @@ #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) diff --git a/source/blender/bmesh/operators/removedoubles.c b/source/blender/bmesh/operators/removedoubles.c index ab77a78487c..7569710d62f 100644 --- a/source/blender/bmesh/operators/removedoubles.c +++ b/source/blender/bmesh/operators/removedoubles.c @@ -23,10 +23,11 @@ #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" diff --git a/source/blender/bmesh/operators/subdivideop.c b/source/blender/bmesh/operators/subdivideop.c index e813ca395a2..aa834fc3d92 100644 --- a/source/blender/bmesh/operators/subdivideop.c +++ b/source/blender/bmesh/operators/subdivideop.c @@ -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 */ diff --git a/source/blender/bmesh/operators/utils.c b/source/blender/bmesh/operators/utils.c index b680cb959f3..f6d6df82407 100644 --- a/source/blender/bmesh/operators/utils.c +++ b/source/blender/bmesh/operators/utils.c @@ -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 */ diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c index 8370ee4ee48..a75cece5248 100644 --- a/source/blender/editors/mesh/bmesh_select.c +++ b/source/blender/editors/mesh/bmesh_select.c @@ -25,10 +25,8 @@ * ***** 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" diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index f3ffcb40e81..bea82e1a15f 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -27,11 +27,11 @@ #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" diff --git a/source/blender/editors/mesh/bmeshutils.c b/source/blender/editors/mesh/bmeshutils.c index aabbbfe8a3a..21e4cf0d7ec 100644 --- a/source/blender/editors/mesh/bmeshutils.c +++ b/source/blender/editors/mesh/bmeshutils.c @@ -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" @@ -42,16 +41,12 @@ #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); diff --git a/source/blender/editors/mesh/editbmesh_add.c b/source/blender/editors/mesh/editbmesh_add.c index 4d806ab02d3..d296009b648 100644 --- a/source/blender/editors/mesh/editbmesh_add.c +++ b/source/blender/editors/mesh/editbmesh_add.c @@ -25,10 +25,9 @@ * ***** 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" @@ -47,10 +46,6 @@ #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]) diff --git a/source/blender/editors/mesh/editbmesh_bvh.c b/source/blender/editors/mesh/editbmesh_bvh.c index b1d68ea7a60..7c7b1eb52e0 100644 --- a/source/blender/editors/mesh/editbmesh_bvh.c +++ b/source/blender/editors/mesh/editbmesh_bvh.c @@ -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" @@ -41,14 +41,10 @@ #include "BKE_DerivedMesh.h" #include "BKE_tessmesh.h" - - #include "ED_mesh.h" #include "ED_view3d.h" - - typedef struct BMBVHTree { BMEditMesh *em; BMesh *bm; diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 06f65e06703..5c020f69cd5 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -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" |