diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-27 11:56:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-27 11:59:52 +0300 |
| commit | 65128cde51e029e4f68836992a99f4b533cfa7d8 (patch) | |
| tree | 97d96b3a787f8d3645b97a29cbbbab463eab0ba7 /source/blender/bmesh | |
| parent | e878f1d00dd459d0b6c4ff2bf68de3dd50530b4c (diff) | |
Cleanup: remove BKE's modifiers_bmesh.c, other DM removal/cleanup in BMesh code.
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/bmesh.h | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 3 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.h | 18 |
3 files changed, 3 insertions, 20 deletions
diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index b84a3d5e559..779259c68f3 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -84,7 +84,7 @@ * Edges and Vertices in BMesh are primitive structures. * * \note There can be more than one edge between two vertices in BMesh, - * though the rest of Blender (e.g. DerivedMesh, CDDM, CCGSubSurf, etc) does not support this. + * though the rest of Blender (i.e. DNA and evaluated Mesh) does not support this. * So it should only occur temporarily during editing operations. * * diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 97f1bad08b7..bb5199fa0c8 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -36,7 +36,8 @@ #include "BLT_translation.h" -#include "BKE_DerivedMesh.h" +#include "DNA_meshdata_types.h" + #include "BKE_mesh.h" #include "bmesh.h" diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h index b4443c748ce..af7745e4c9f 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.h +++ b/source/blender/bmesh/intern/bmesh_mesh.h @@ -129,22 +129,4 @@ extern const BMAllocTemplate bm_mesh_chunksize_default; } #define BMALLOC_TEMPLATE_FROM_ME(...) VA_NARGS_CALL_OVERLOAD(_VA_BMALLOC_TEMPLATE_FROM_ME_, __VA_ARGS__) -#define _VA_BMALLOC_TEMPLATE_FROM_DM_1(dm) { \ - (CHECK_TYPE_INLINE(dm, DerivedMesh *), \ - (dm)->getNumVerts(dm)), \ - (dm)->getNumEdges(dm), \ - (dm)->getNumLoops(dm), \ - (dm)->getNumPolys(dm), \ -} -#define _VA_BMALLOC_TEMPLATE_FROM_DM_2(dm_a, dm_b) { \ - (CHECK_TYPE_INLINE(dm_a, DerivedMesh *), \ - CHECK_TYPE_INLINE(dm_b, DerivedMesh *), \ - (dm_a)->getNumVerts(dm_a)) + (dm_b)->getNumVerts(dm_b), \ - (dm_a)->getNumEdges(dm_a) + (dm_b)->getNumEdges(dm_b), \ - (dm_a)->getNumLoops(dm_a) + (dm_b)->getNumLoops(dm_b), \ - (dm_a)->getNumPolys(dm_a) + (dm_b)->getNumPolys(dm_b), \ -} - -#define BMALLOC_TEMPLATE_FROM_DM(...) VA_NARGS_CALL_OVERLOAD(_VA_BMALLOC_TEMPLATE_FROM_DM_, __VA_ARGS__) - #endif /* __BMESH_MESH_H__ */ |