[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59395] trunk/blender/source/blender: move bmesh tools into their own include,
Campbell Barton
ideasman42 at gmail.com
Fri Aug 23 06:22:07 CEST 2013
Revision: 59395
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59395
Author: campbellbarton
Date: 2013-08-23 04:22:07 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
move bmesh tools into their own include,
changes to tool args would rebuild far too many files and these are mainly by modifiers outside of bmesh.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/CMakeLists.txt
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
trunk/blender/source/blender/bmesh/operators/bmo_bisect_plane.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_edgenet.c
trunk/blender/source/blender/bmesh/operators/bmo_fill_holes.c
trunk/blender/source/blender/bmesh/operators/bmo_split_edges.c
trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
trunk/blender/source/blender/bmesh/operators/bmo_unsubdivide.c
trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c
trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
trunk/blender/source/blender/bmesh/tools/bmesh_edgenet.c
trunk/blender/source/blender/editors/mesh/editmesh_path.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blender/modifiers/intern/MOD_triangulate.c
Added Paths:
-----------
trunk/blender/source/blender/bmesh/bmesh_tools.h
Modified: trunk/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/bmesh/CMakeLists.txt 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/CMakeLists.txt 2013-08-23 04:22:07 UTC (rev 59395)
@@ -136,8 +136,11 @@
tools/bmesh_triangulate.c
tools/bmesh_triangulate.h
+ bmesh_class.h
+
+ # public includes
bmesh.h
- bmesh_class.h
+ bmesh_tools.h
)
if(MSVC)
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2013-08-23 04:22:07 UTC (rev 59395)
@@ -269,14 +269,6 @@
#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
Added: trunk/blender/source/blender/bmesh/bmesh_tools.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_tools.h (rev 0)
+++ trunk/blender/source/blender/bmesh/bmesh_tools.h 2013-08-23 04:22:07 UTC (rev 59395)
@@ -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__ */
Property changes on: trunk/blender/source/blender/bmesh/bmesh_tools.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -29,6 +29,7 @@
#include "BLI_utildefines.h"
#include "bmesh.h"
+#include "bmesh_tools.h"
#include "intern/bmesh_operators_private.h" /* own include */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_bisect_plane.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bisect_plane.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bisect_plane.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -30,6 +30,7 @@
#include "BLI_math.h"
#include "bmesh.h"
+#include "bmesh_tools.h"
#include "intern/bmesh_operators_private.h" /* own include */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -32,6 +32,8 @@
#include "BLI_math.h"
#include "bmesh.h"
+#include "bmesh_tools.h"
+
#include "intern/bmesh_operators_private.h"
Modified: trunk/blender/source/blender/bmesh/operators/bmo_edgenet.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_edgenet.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/operators/bmo_edgenet.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -37,6 +37,7 @@
#include "BLI_heap.h"
#include "bmesh.h"
+#include "bmesh_tools.h"
#include "intern/bmesh_operators_private.h" /* own include */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_fill_holes.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_fill_holes.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/operators/bmo_fill_holes.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -31,6 +31,7 @@
#include "BLI_utildefines.h"
#include "bmesh.h"
+#include "bmesh_tools.h"
#include "intern/bmesh_operators_private.h" /* own include */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_split_edges.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_split_edges.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/operators/bmo_split_edges.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -29,6 +29,7 @@
#include "BLI_utildefines.h"
#include "bmesh.h"
+#include "bmesh_tools.h"
#include "intern/bmesh_operators_private.h" /* own include */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -34,6 +34,7 @@
#include "BLI_scanfill.h"
#include "bmesh.h"
+#include "bmesh_tools.h"
#include "intern/bmesh_operators_private.h"
Modified: trunk/blender/source/blender/bmesh/operators/bmo_unsubdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_unsubdivide.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/operators/bmo_unsubdivide.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -31,6 +31,7 @@
#include "BLI_utildefines.h"
#include "bmesh.h"
+#include "bmesh_tools.h"
#include "intern/bmesh_operators_private.h" /* own include */
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -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
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -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"
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -32,10 +32,9 @@
#include "BLI_math.h"
#include "bmesh.h"
+#include "bmesh_decimate.h" /* own include */
-#include "intern/bmesh_operators_private.h" /* own include */
-
static bool bm_vert_dissolve_fan_test(BMVert *v)
{
/* check if we should walk over these verts */
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_edgenet.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_edgenet.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_edgenet.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -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"
Modified: trunk/blender/source/blender/editors/mesh/editmesh_path.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_path.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/editors/mesh/editmesh_path.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -52,6 +52,9 @@
#include "WM_types.h"
+#include "bmesh.h"
+#include "bmesh_tools.h"
+
#include "mesh_intern.h" /* own include */
struct UserData {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2013-08-23 04:04:46 UTC (rev 59394)
+++ trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2013-08-23 04:22:07 UTC (rev 59395)
@@ -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 */
/**
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2013-08-23 04:04:46 UTC (rev 59394)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list