diff options
22 files changed, 80 insertions, 11 deletions
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 2e9e830474b..67f95cca6aa 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -136,8 +136,11 @@ set(SRC tools/bmesh_triangulate.c tools/bmesh_triangulate.h - bmesh.h bmesh_class.h + + # public includes + bmesh.h + bmesh_tools.h ) if(MSVC) diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 1b167b3f29a..985904b0bec 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -269,14 +269,6 @@ extern "C" { #include "intern/bmesh_inline.h" -#include "tools/bmesh_bevel.h" -#include "tools/bmesh_bisect_plane.h" -#include "tools/bmesh_decimate.h" -#include "tools/bmesh_edgenet.h" -#include "tools/bmesh_edgesplit.h" -#include "tools/bmesh_path.h" -#include "tools/bmesh_triangulate.h" - #ifdef __cplusplus } #endif diff --git a/source/blender/bmesh/bmesh_tools.h b/source/blender/bmesh/bmesh_tools.h new file mode 100644 index 00000000000..b2dac810bce --- /dev/null +++ b/source/blender/bmesh/bmesh_tools.h @@ -0,0 +1,49 @@ +/* + * ***** 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): + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __BMESH_TOOLS_H__ +#define __BMESH_TOOLS_H__ + +/** \file blender/bmesh/bmesh_tools.h + * \ingroup bmesh + * + * Utility functions that operate directly on the BMesh, + * These can be used by both Modifiers and BMesh-Operators. + */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include "tools/bmesh_bevel.h" +#include "tools/bmesh_bisect_plane.h" +#include "tools/bmesh_decimate.h" +#include "tools/bmesh_edgenet.h" +#include "tools/bmesh_edgesplit.h" +#include "tools/bmesh_path.h" +#include "tools/bmesh_triangulate.h" + +#ifdef __cplusplus +} +#endif + +#endif /* __BMESH_TOOLS_H__ */ diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index dc06b0b4f13..eef470e0d85 100644 --- a/source/blender/bmesh/operators/bmo_bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c @@ -29,6 +29,7 @@ #include "BLI_utildefines.h" #include "bmesh.h" +#include "bmesh_tools.h" #include "intern/bmesh_operators_private.h" /* own include */ diff --git a/source/blender/bmesh/operators/bmo_bisect_plane.c b/source/blender/bmesh/operators/bmo_bisect_plane.c index a4103bfec41..d651f3974e0 100644 --- a/source/blender/bmesh/operators/bmo_bisect_plane.c +++ b/source/blender/bmesh/operators/bmo_bisect_plane.c @@ -30,6 +30,7 @@ #include "BLI_math.h" #include "bmesh.h" +#include "bmesh_tools.h" #include "intern/bmesh_operators_private.h" /* own include */ diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index e038b6b9f05..d3c7a6864c3 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -32,6 +32,8 @@ #include "BLI_math.h" #include "bmesh.h" +#include "bmesh_tools.h" + #include "intern/bmesh_operators_private.h" diff --git a/source/blender/bmesh/operators/bmo_edgenet.c b/source/blender/bmesh/operators/bmo_edgenet.c index 0d9521a6ad4..c58a11f21ec 100644 --- a/source/blender/bmesh/operators/bmo_edgenet.c +++ b/source/blender/bmesh/operators/bmo_edgenet.c @@ -37,6 +37,7 @@ #include "BLI_heap.h" #include "bmesh.h" +#include "bmesh_tools.h" #include "intern/bmesh_operators_private.h" /* own include */ diff --git a/source/blender/bmesh/operators/bmo_fill_holes.c b/source/blender/bmesh/operators/bmo_fill_holes.c index 475eb5ba32d..8160d28d7a7 100644 --- a/source/blender/bmesh/operators/bmo_fill_holes.c +++ b/source/blender/bmesh/operators/bmo_fill_holes.c @@ -31,6 +31,7 @@ #include "BLI_utildefines.h" #include "bmesh.h" +#include "bmesh_tools.h" #include "intern/bmesh_operators_private.h" /* own include */ diff --git a/source/blender/bmesh/operators/bmo_split_edges.c b/source/blender/bmesh/operators/bmo_split_edges.c index 7eea4c4878d..eb7946caff0 100644 --- a/source/blender/bmesh/operators/bmo_split_edges.c +++ b/source/blender/bmesh/operators/bmo_split_edges.c @@ -29,6 +29,7 @@ #include "BLI_utildefines.h" #include "bmesh.h" +#include "bmesh_tools.h" #include "intern/bmesh_operators_private.h" /* own include */ diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c index 754709b18c0..2d6fad7afc9 100644 --- a/source/blender/bmesh/operators/bmo_triangulate.c +++ b/source/blender/bmesh/operators/bmo_triangulate.c @@ -34,6 +34,7 @@ #include "BLI_scanfill.h" #include "bmesh.h" +#include "bmesh_tools.h" #include "intern/bmesh_operators_private.h" diff --git a/source/blender/bmesh/operators/bmo_unsubdivide.c b/source/blender/bmesh/operators/bmo_unsubdivide.c index c1cfb1866f4..ec222b48751 100644 --- a/source/blender/bmesh/operators/bmo_unsubdivide.c +++ b/source/blender/bmesh/operators/bmo_unsubdivide.c @@ -31,6 +31,7 @@ #include "BLI_utildefines.h" #include "bmesh.h" +#include "bmesh_tools.h" #include "intern/bmesh_operators_private.h" /* own include */ diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 3152c50b25a..04c20dd9052 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -42,6 +42,8 @@ #include "BKE_deform.h" #include "bmesh.h" +#include "bmesh_bevel.h" /* own include */ + #include "./intern/bmesh_private.h" #define BEVEL_EPSILON_D 1e-6 diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c index 516cd160684..4852b2c9b59 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.c +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c @@ -38,6 +38,7 @@ #include "BLI_math.h" #include "bmesh.h" +#include "bmesh_bisect_plane.h" /* own include */ #ifdef __GNUC__ # pragma GCC diagnostic error "-Wsign-conversion" diff --git a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c index 0667d560615..bc9288f98f6 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c +++ b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c @@ -32,8 +32,7 @@ #include "BLI_math.h" #include "bmesh.h" - -#include "intern/bmesh_operators_private.h" /* own include */ +#include "bmesh_decimate.h" /* own include */ static bool bm_vert_dissolve_fan_test(BMVert *v) diff --git a/source/blender/bmesh/tools/bmesh_edgenet.c b/source/blender/bmesh/tools/bmesh_edgenet.c index 44188d9c34c..066ccbb0948 100644 --- a/source/blender/bmesh/tools/bmesh_edgenet.c +++ b/source/blender/bmesh/tools/bmesh_edgenet.c @@ -37,6 +37,7 @@ #include "BLI_linklist.h" #include "bmesh.h" +#include "bmesh_edgenet.h" /* own include */ #ifdef __GNUC__ # pragma GCC diagnostic error "-Wsign-conversion" diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index e7eaa625843..18db21a8726 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -52,6 +52,9 @@ #include "WM_types.h" +#include "bmesh.h" +#include "bmesh_tools.h" + #include "mesh_intern.h" /* own include */ struct UserData { diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 0aa46ea299b..d371b7a7a99 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -50,6 +50,9 @@ #include "ED_transform.h" #include "ED_view3d.h" +#include "bmesh.h" +#include "bmesh_tools.h" + #include "mesh_intern.h" /* own include */ /** diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index a5de6b1eea8..d4a10781368 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -92,6 +92,7 @@ #include "GPU_buffers.h" #include "bmesh.h" +#include "bmesh_tools.h" #include <math.h> #include <stdlib.h> diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 01b14abfb1f..326ffba3e2e 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -46,6 +46,7 @@ #include "MOD_util.h" #include "bmesh.h" +#include "bmesh_tools.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 9fdb40e71dc..69988f32da9 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -49,6 +49,7 @@ #include "BKE_cdderivedmesh.h" #include "bmesh.h" +#include "bmesh_tools.h" // #define USE_TIMEIT diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index b3d3e65e120..d55ebdad939 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -44,6 +44,7 @@ #include "BKE_modifier.h" #include "bmesh.h" +#include "bmesh_tools.h" #include "DNA_object_types.h" diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index 9155aa0044b..ffc813068b8 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -33,6 +33,9 @@ #include "BKE_modifier.h" #include "BKE_editmesh.h" +#include "bmesh.h" +#include "bmesh_tools.h" + static DerivedMesh *triangulate_dm(DerivedMesh *dm, const int flag) { DerivedMesh *result; |