diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 45 | ||||
-rw-r--r-- | source/blender/bmesh/bmesh.h | 1 | ||||
-rw-r--r-- | source/blender/bmesh/bmesh_filters.h | 26 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_bevel.c (renamed from source/blender/bmesh/operators/bevel.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_connect.c (renamed from source/blender/bmesh/operators/connectops.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_create.c (renamed from source/blender/bmesh/operators/createops.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dissolve.c (renamed from source/blender/bmesh/operators/dissolveops.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dupe.c (renamed from source/blender/bmesh/operators/bmesh_dupeops.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_edgesplit.c (renamed from source/blender/bmesh/operators/edgesplitop.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_extrude.c (renamed from source/blender/bmesh/operators/extrudeops.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_join_triangles.c (renamed from source/blender/bmesh/operators/join_triangles.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_mesh_conv.c (renamed from source/blender/bmesh/operators/mesh_conv.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_mirror.c (renamed from source/blender/bmesh/operators/mirror.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_primitive.c (renamed from source/blender/bmesh/operators/primitiveops.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c (renamed from source/blender/bmesh/operators/removedoubles.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c (renamed from source/blender/bmesh/operators/subdivideop.c) | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.h (renamed from source/blender/bmesh/operators/subdivideop.h) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_triangulate.c (renamed from source/blender/bmesh/operators/triangulateop.c) | 0 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_utils.c (renamed from source/blender/bmesh/operators/utils.c) | 0 |
19 files changed, 24 insertions, 50 deletions
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index a432fa155c8..d8349012a5f 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -63,24 +63,23 @@ set(INC_SYS ) set(SRC - operators/bevel.c - operators/bmesh_dupeops.c - operators/utils.c - operators/subdivideop.c - operators/connectops.c - operators/removedoubles.c - operators/mirror.c - operators/primitiveops.c - operators/join_triangles.c - operators/edgesplitop.c - operators/createops.c - operators/dissolveops.c - operators/subdivideop.h - operators/triangulateop.c - operators/mesh_conv.c - operators/extrudeops.c - bmesh_operators.h - bmesh_iterators.h + operators/bmo_bevel.c + operators/bmo_connect.c + operators/bmo_create.c + operators/bmo_dissolve.c + operators/bmo_dupe.c + operators/bmo_edgesplit.c + operators/bmo_extrude.c + operators/bmo_join_triangles.c + operators/bmo_mesh_conv.c + operators/bmo_mirror.c + operators/bmo_primitive.c + operators/bmo_removedoubles.c + operators/bmo_subdivide.c + operators/bmo_subdivide.h + operators/bmo_triangulate.c + operators/bmo_utils.c + intern/bmesh_newcore.c intern/bmesh_interp.c intern/bmesh_iterators.c @@ -102,14 +101,16 @@ set(SRC intern/bmesh_walkers_impl.c intern/bmesh_walkers_private.h intern/bmesh_inline.c + tools/BME_bevel.c - bmesh_error.h - bmesh_queries.h bmesh.h + bmesh_class.h + bmesh_error.h + bmesh_iterators.h bmesh_marking.h bmesh_operator_api.h - bmesh_filters.h - bmesh_class.h + bmesh_operators.h + bmesh_queries.h bmesh_walkers.h ) diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 0e0546f4875..592712fbf39 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -355,7 +355,6 @@ void bmesh_end_edit(BMesh *bm, int flag); #define BM_NGON_MAX 100000 /* include the rest of the API */ -#include "bmesh_filters.h" #include "bmesh_marking.h" #include "bmesh_operator_api.h" #include "bmesh_operators.h" diff --git a/source/blender/bmesh/bmesh_filters.h b/source/blender/bmesh/bmesh_filters.h deleted file mode 100644 index b9fce451e23..00000000000 --- a/source/blender/bmesh/bmesh_filters.h +++ /dev/null @@ -1,26 +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. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BM_FILTER_H -#define BM_FILTER_H - -#endif diff --git a/source/blender/bmesh/operators/bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index 928fd6b2fe8..928fd6b2fe8 100644 --- a/source/blender/bmesh/operators/bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c diff --git a/source/blender/bmesh/operators/connectops.c b/source/blender/bmesh/operators/bmo_connect.c index 0ef6ecffb06..0ef6ecffb06 100644 --- a/source/blender/bmesh/operators/connectops.c +++ b/source/blender/bmesh/operators/bmo_connect.c diff --git a/source/blender/bmesh/operators/createops.c b/source/blender/bmesh/operators/bmo_create.c index af0758b153f..af0758b153f 100644 --- a/source/blender/bmesh/operators/createops.c +++ b/source/blender/bmesh/operators/bmo_create.c diff --git a/source/blender/bmesh/operators/dissolveops.c b/source/blender/bmesh/operators/bmo_dissolve.c index ad93670cf54..ad93670cf54 100644 --- a/source/blender/bmesh/operators/dissolveops.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c diff --git a/source/blender/bmesh/operators/bmesh_dupeops.c b/source/blender/bmesh/operators/bmo_dupe.c index a4cad447204..a4cad447204 100644 --- a/source/blender/bmesh/operators/bmesh_dupeops.c +++ b/source/blender/bmesh/operators/bmo_dupe.c diff --git a/source/blender/bmesh/operators/edgesplitop.c b/source/blender/bmesh/operators/bmo_edgesplit.c index 41ad1c89e75..41ad1c89e75 100644 --- a/source/blender/bmesh/operators/edgesplitop.c +++ b/source/blender/bmesh/operators/bmo_edgesplit.c diff --git a/source/blender/bmesh/operators/extrudeops.c b/source/blender/bmesh/operators/bmo_extrude.c index e0c2b2da227..e0c2b2da227 100644 --- a/source/blender/bmesh/operators/extrudeops.c +++ b/source/blender/bmesh/operators/bmo_extrude.c diff --git a/source/blender/bmesh/operators/join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index e996a96b7e6..e996a96b7e6 100644 --- a/source/blender/bmesh/operators/join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c diff --git a/source/blender/bmesh/operators/mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 3ca337ddcdf..3ca337ddcdf 100644 --- a/source/blender/bmesh/operators/mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c diff --git a/source/blender/bmesh/operators/mirror.c b/source/blender/bmesh/operators/bmo_mirror.c index 99ff0b55e7b..99ff0b55e7b 100644 --- a/source/blender/bmesh/operators/mirror.c +++ b/source/blender/bmesh/operators/bmo_mirror.c diff --git a/source/blender/bmesh/operators/primitiveops.c b/source/blender/bmesh/operators/bmo_primitive.c index bb11876d979..bb11876d979 100644 --- a/source/blender/bmesh/operators/primitiveops.c +++ b/source/blender/bmesh/operators/bmo_primitive.c diff --git a/source/blender/bmesh/operators/removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 918284854e0..918284854e0 100644 --- a/source/blender/bmesh/operators/removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c diff --git a/source/blender/bmesh/operators/subdivideop.c b/source/blender/bmesh/operators/bmo_subdivide.c index 66f337a4f1b..d99d944254d 100644 --- a/source/blender/bmesh/operators/subdivideop.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -38,7 +38,7 @@ #include "bmesh_operators_private.h" /* own include */ -#include "subdivideop.h" /* own include */ +#include "bmo_subdivide.h" /* own include */ /* flags for all elements share a common bitfield space */ #define SUBD_SPLIT 1 diff --git a/source/blender/bmesh/operators/subdivideop.h b/source/blender/bmesh/operators/bmo_subdivide.h index a0e2574b09f..a0e2574b09f 100644 --- a/source/blender/bmesh/operators/subdivideop.h +++ b/source/blender/bmesh/operators/bmo_subdivide.h diff --git a/source/blender/bmesh/operators/triangulateop.c b/source/blender/bmesh/operators/bmo_triangulate.c index 78dd721c0f3..78dd721c0f3 100644 --- a/source/blender/bmesh/operators/triangulateop.c +++ b/source/blender/bmesh/operators/bmo_triangulate.c diff --git a/source/blender/bmesh/operators/utils.c b/source/blender/bmesh/operators/bmo_utils.c index cf6272f5c9c..cf6272f5c9c 100644 --- a/source/blender/bmesh/operators/utils.c +++ b/source/blender/bmesh/operators/bmo_utils.c |