Revision: 44027
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44027
Author: campbellbarton
Date: 2012-02-11 08:46:56 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
include cleanup
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_selecthistory.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -36,71 +36,17 @@
#include "BLI_utildefines.h"
#include "BLI_math.h"
-#include "BLI_blenlib.h"
-#include "BLI_kdopbvh.h"
-#include "BLI_kdtree.h"
-#include "BLI_linklist.h"
-#include "BLI_rand.h"
-#include "BLI_edgehash.h"
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"
#include "MEM_guardedalloc.h"
-#include "DNA_action_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_cloth_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_effect_types.h"
-#include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
#include "DNA_object_types.h"
-#include "DNA_object_force.h"
-#include "DNA_particle_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_texture_types.h"
-#include "BLI_editVert.h"
#include "BLI_array.h"
-#include "BKE_main.h"
-#include "BKE_anim.h"
#include "BKE_bmesh.h"
-// XXX #include "BKE_booleanops.h"
-#include "BKE_cloth.h"
-#include "BKE_collision.h"
-#include "BKE_cdderivedmesh.h"
-#include "BKE_curve.h"
-#include "BKE_customdata.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_lattice.h"
-#include "BKE_library.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
-#include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
#include "BKE_tessmesh.h"
-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-#include "CCGSubSurf.h"
-#include "RE_shader_ext.h"
-#include "LOD_decimation.h"
-
/* converts a cddm to a BMEditMesh. if existing is non-NULL, the
* new geometry will be put in there.*/
BMEditMesh *CDDM_To_BMesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing,
int do_tesselate)
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -22,17 +22,11 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"
#include "BLI_array.h"
#include "BLI_math.h"
-#include "BLI_array.h"
-#include "BLI_utildefines.h"
#include "BLI_smallhash.h"
#include "bmesh.h"
-#include "bmesh_operators_private.h"
#define BEVEL_FLAG 1
#define BEVEL_DEL 2
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -22,15 +22,11 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"
#include "BLI_array.h"
#include "BLI_math.h"
#include "bmesh.h"
-#include "bmesh_operators_private.h"
/* local flag define */
#define DUPE_INPUT 1 /* input from operato */
Modified: branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -22,17 +22,12 @@
#include "MEM_guardedalloc.h"
-#include "BKE_utildefines.h"
#include "bmesh.h"
-#include "mesh_intern.h"
-#include "bmesh_private.h"
+
#include "BLI_math.h"
#include "BLI_array.h"
-#include <stdio.h>
-#include <string.h>
-
#define VERT_INPUT 1
#define EDGE_OUT 1
#define FACE_NEW 2
Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -22,12 +22,10 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
+#include "DNA_mesh_types.h"
-#include "BLI_memarena.h"
-#include "BLI_mempool.h"
+
#include "BLI_heap.h"
-#include "BLI_ghash.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_array.h"
@@ -35,8 +33,8 @@
#include "BLI_rand.h"
#include "bmesh.h"
-#include "bmesh_operators_private.h"
+
#define EDGE_MARK 1
#define EDGE_VIS 2
Modified: branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -22,18 +22,19 @@
#include "MEM_guardedalloc.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
#include "BKE_utildefines.h"
-#include "bmesh.h"
-#include "mesh_intern.h"
-#include "bmesh_private.h"
#include "BLI_math.h"
#include "BLI_array.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "bmesh.h"
+#include "bmesh_private.h"
+#include "bmesh_operators_private.h" /* own include */
+
#define FACE_MARK 1
#define FACE_ORIG 2
#define FACE_NEW 4
Modified: branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -22,29 +22,18 @@
#include "MEM_guardedalloc.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
#include "BKE_utildefines.h"
-#include "BKE_tessmesh.h"
#include "BLI_math.h"
-#include "BLI_rand.h"
-#include "BLI_ghash.h"
#include "BLI_array.h"
-#include "DNA_object_types.h"
-
-#include "ED_mesh.h"
-
#include "bmesh.h"
-#include "mesh_intern.h"
-#include "subdivideop.h"
#include "bmesh_operators_private.h" /* own include */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
typedef struct EdgeTag {
BMVert *newv1, *newv2;
BMEdge *newe1, *newe2;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -22,21 +22,17 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"
+#include "BKE_utildefines.h"
+
#include "BLI_math.h"
#include "BLI_array.h"
#include "bmesh.h"
-#include "bmesh_private.h"
-#include "bmesh_operators_private.h"
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "bmesh_operators_private.h" /* own include */
#define EXT_INPUT 1
#define EXT_KEEP 2
Modified: branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -21,30 +21,15 @@
*/
#include "MEM_guardedalloc.h"
-#include "BKE_customdata.h"
-#include "DNA_listBase.h"
-#include "DNA_customdata_types.h"
+
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include <string.h>
+
#include "BKE_utildefines.h"
-#include "BKE_mesh.h"
-#include "BKE_global.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_cdderivedmesh.h"
-#include "BLI_editVert.h"
-#include "mesh_intern.h"
-#include "ED_mesh.h"
-
#include "BLI_math.h"
#include "BLI_array.h"
-#include "BLI_edgehash.h"
-#include "BLI_heap.h"
-
#include "bmesh.h"
#include "bmesh_operators_private.h" /* own include */
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2012-02-11 04:16:17 UTC (rev 44026)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2012-02-11 08:46:56 UTC (rev 44027)
@@ -20,42 +20,29 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#include <string.h>
-
#include "MEM_guardedalloc.h"
-#include "DNA_listBase.h"
-#include "DNA_customdata_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_key_types.h"
#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
+#include "DNA_key_types.h"
+#include "DNA_modifier_types.h"
-#include "BKE_customdata.h"
#include "BKE_mesh.h"
+#include "BKE_utildefines.h"
+#include "BLI_listbase.h"
#include "BKE_global.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_cdderivedmesh.h"
#include "BKE_key.h"
#include "BKE_main.h"
-#include "BLI_utildefines.h"
-#include "BLI_listbase.h"
#include "BLI_math.h"
-#include "BLI_edgehash.h"
-#include "BLI_editVert.h"
-#include "BLI_scanfill.h"
#include "BLI_array.h"
-#include "BLI_utildefines.h"
-#include "ED_mesh.h"
-
-#include "mesh_intern.h"
#include "bmesh.h"
#include "bmesh_private.h"
+#include "bmesh_operators_private.h" /* own include */
+
/*
* MESH CONV.C
*
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
