diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-19 08:49:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-19 08:49:32 +0400 |
commit | 1f3e3b0d68ca0469ece01f91e891310b3773a87b (patch) | |
tree | d9876f9e5c114c3499064191bb607ad95d93fd7c /source | |
parent | 3134407c48f2623ad5f55db5d868fb82346dfa7b (diff) |
include cleanup
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/mesh/editface.c | 6 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_loopcut.c | 27 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_rip.c | 3 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 3 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 3 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 15 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_navmesh.c | 12 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 7 | ||||
-rw-r--r-- | source/blender/editors/mesh/meshtools.c | 24 |
12 files changed, 5 insertions, 105 deletions
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 05f2269c359..29139c5154f 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -27,12 +27,9 @@ * \ingroup edmesh */ -#include <math.h> -#include <string.h> #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_edgehash.h" @@ -41,9 +38,7 @@ #include "IMB_imbuf.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "BKE_DerivedMesh.h" #include "BKE_global.h" @@ -61,7 +56,6 @@ #include "WM_types.h" /* own include */ -#include "mesh_intern.h" /* copy the face flags, most importantly selection from the mesh to the final derived mesh, * use in object mode when selecting faces (while painting) */ diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index adcec5699a9..a356f9fca7f 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -29,7 +29,6 @@ * \ingroup edmesh */ -#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -39,7 +38,6 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_depsgraph.h" #include "BKE_library.h" #include "BKE_tessmesh.h" diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 31d5eed83dc..a195f37b60e 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -38,14 +38,11 @@ #include "BLI_blenlib.h" #include "BLI_array.h" #include "BLI_math.h" -#include "BLI_rand.h" #include "BLI_smallhash.h" -#include "BLI_scanfill.h" #include "BLI_memarena.h" #include "BKE_DerivedMesh.h" #include "BKE_context.h" -#include "BKE_depsgraph.h" #include "BIF_gl.h" #include "BIF_glutil.h" /* for paint cursor */ @@ -59,7 +56,6 @@ #include "WM_types.h" #include "DNA_scene_types.h" -#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "BKE_tessmesh.h" #include "UI_resources.h" diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 7721f878ce6..a3b26a56cb3 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -28,46 +28,21 @@ * \ingroup edmesh */ -#include <float.h> -#ifdef _MSC_VER -# define _USE_MATH_DEFINES -#endif -#include <math.h> -#include <string.h> -#include <ctype.h> -#include <stdio.h> - -#include "DNA_ID.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" -#include "PIL_time.h" - #include "BLI_array.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_dynstr.h" /*for WM_operator_pystring */ -#include "BLI_utildefines.h" -#include "BKE_blender.h" #include "BKE_context.h" -#include "BKE_depsgraph.h" -#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_report.h" -#include "BKE_scene.h" #include "BKE_tessmesh.h" -#include "BKE_depsgraph.h" #include "BIF_gl.h" -#include "BIF_glutil.h" /* for paint cursor */ - -#include "IMB_imbuf_types.h" #include "ED_screen.h" #include "ED_space_api.h" @@ -78,8 +53,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" - #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 4909561f677..6cbf5e88cee 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -31,7 +31,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" #include "RNA_define.h" @@ -41,11 +40,9 @@ #include "BLI_array.h" #include "BKE_context.h" -#include "BKE_object.h" #include "BKE_report.h" #include "BKE_tessmesh.h" -#include "WM_api.h" #include "WM_types.h" #include "ED_mesh.h" diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 6ca7777f8e2..8f1d86e8b9b 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -40,7 +40,6 @@ #include "BKE_context.h" #include "BKE_displist.h" -#include "BKE_depsgraph.h" #include "BKE_report.h" #include "BKE_paint.h" #include "BKE_tessmesh.h" @@ -56,9 +55,7 @@ #include "ED_mesh.h" #include "ED_screen.h" -#include "ED_util.h" #include "ED_uvedit.h" -#include "ED_object.h" #include "ED_view3d.h" #include "BIF_gl.h" diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index e2083539392..5ee6d4ac8ec 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -41,7 +41,6 @@ #include "RNA_define.h" #include "RNA_access.h" -#include "BLI_array.h" #include "BLI_blenlib.h" #include "BLI_noise.h" #include "BLI_math.h" @@ -49,9 +48,7 @@ #include "BKE_material.h" #include "BKE_context.h" -#include "BKE_cdderivedmesh.h" #include "BKE_depsgraph.h" -#include "BKE_mesh.h" #include "BKE_object.h" #include "BKE_report.h" #include "BKE_texture.h" diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index b1094c75f27..56acccaee45 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -35,15 +35,12 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_blenlib.h" #include "BLI_math.h" #include "BKE_DerivedMesh.h" -#include "BKE_bmesh.h" #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_key.h" -#include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_report.h" #include "BKE_tessmesh.h" @@ -56,7 +53,6 @@ #include "ED_mesh.h" #include "ED_util.h" -#include "bmesh.h" #include "mesh_intern.h" diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index e9906f852de..641d1be7a2e 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -28,35 +28,23 @@ * \ingroup edmesh */ - -#include <math.h> -#include <stdlib.h> -#include <string.h> - #include "MEM_guardedalloc.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_view3d_types.h" -#include "BLI_utildefines.h" #include "BLI_path_util.h" #include "BLI_array.h" #include "BLI_math.h" -#include "BLI_edgehash.h" -#include "BLI_linklist.h" -#include "BLI_listbase.h" #include "BKE_context.h" #include "BKE_depsgraph.h" -#include "BKE_displist.h" #include "BKE_image.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_report.h" #include "BKE_tessmesh.h" @@ -72,10 +60,9 @@ #include "ED_uvedit.h" #include "ED_view3d.h" -#include "RE_render_ext.h" - #include "mesh_intern.h" + static CustomData *mesh_customdata_get_type(Mesh *me, const char htype, int *r_tot) { CustomData *data; diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index 21564d2d348..1a81cab8de7 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -26,31 +26,22 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include <math.h> - #include "MEM_guardedalloc.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_modifier_types.h" -#include "DNA_ID.h" #include "BLI_listbase.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_linklist.h" #include "BKE_library.h" #include "BKE_depsgraph.h" #include "BKE_context.h" -#include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_modifier.h" #include "BKE_scene.h" #include "BKE_DerivedMesh.h" -#include "BKE_cdderivedmesh.h" #include "BKE_report.h" #include "BKE_tessmesh.h" @@ -58,14 +49,13 @@ #include "ED_mesh.h" #include "ED_screen.h" -#include "RNA_access.h" - #include "WM_api.h" #include "WM_types.h" #include "mesh_intern.h" #include "recast-capi.h" + static void createVertsTrisData(bContext *C, LinkNode *obs, int *nverts_r, float **verts_r, int *ntris_r, int **tris_r) { MVert *mvert; diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index a413a60412c..09b190d4e24 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -29,17 +29,11 @@ */ -#include <stdlib.h> -#include <math.h> -#include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "BLI_math.h" -#include "BLI_blenlib.h" -#include "BKE_context.h" #include "RNA_access.h" @@ -49,7 +43,6 @@ #include "ED_object.h" #include "ED_mesh.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "mesh_intern.h" diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index c0b6327d740..2b3e310363e 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -27,35 +27,22 @@ /** \file blender/editors/mesh/meshtools.c * \ingroup edmesh + * + * meshtools.c: no editmode (violated already :), mirror & join), + * tools operating on meshes */ - -/* - * meshtools.c: no editmode (violated already :), tools operating on meshes - */ - -#include <stddef.h> -#include <stdlib.h> -#include <math.h> -#include <float.h> - #include "MEM_guardedalloc.h" #include "DNA_mesh_types.h" -#include "DNA_view3d_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" -#include "BLI_ghash.h" -#include "BLI_rand.h" /* for randome face sorting */ -#include "BLI_threads.h" #include "BKE_context.h" @@ -71,7 +58,6 @@ #include "BKE_tessmesh.h" #include "BKE_multires.h" -#include "BLO_sys_types.h" // for intptr_t support #include "ED_mesh.h" #include "ED_object.h" @@ -80,10 +66,6 @@ #include "WM_api.h" #include "WM_types.h" -/* own include */ -#include "mesh_intern.h" -#include "uvedit_intern.h" - /* * ********************** no editmode!!! *********** */ /*********************** JOIN ***************************/ |