diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-19 04:54:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-19 04:54:55 +0400 |
| commit | cdc4037f0dbdc73016420504a3c6c0f6de78d3a3 (patch) | |
| tree | e08f93759de10b9279c1dbe42b9c9ce2720243af /source/blender/bmesh/intern/bmesh_private.h | |
| parent | eb1fccd8a54c33a057fa3692eb3dfa1012f4fdfc (diff) | |
bmesh: BM_verts_in_face was using bmesh operator flag which is no longer ensured to be available,
use internal apiflag instead, Thanks to Nicholas Bishop for spotting.
also quiet some warnings.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_private.h')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_private.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h index a5eb7e63505..850e81ba3ac 100644 --- a/source/blender/bmesh/intern/bmesh_private.h +++ b/source/blender/bmesh/intern/bmesh_private.h @@ -56,11 +56,16 @@ int bmesh_elem_check(void *element, const char htype); int bmesh_radial_length(BMLoop *l); int bmesh_disk_count(BMVert *v); -/* NOTE: ensure different parts of the API do not conflict +/** + * Internal BMHeader.api_flag + * \note Ensure different parts of the API do not conflict * on using these internal flags!*/ -#define _FLAG_JF 1 /* join faces */ -#define _FLAG_MF 2 /* make face */ -#define _FLAG_MV 2 /* make face, vertex */ +enum { + _FLAG_JF = (1 << 0), /* join faces */ + _FLAG_MF = (1 << 1), /* make face */ + _FLAG_MV = (1 << 1), /* make face, vertex */ + _FLAG_OVERLAP = (1 << 2) /* general overlap flag */ +}; #define BM_ELEM_API_FLAG_ENABLE(element, f) ((element)->head.api_flag |= (f)) #define BM_ELEM_API_FLAG_DISABLE(element, f) ((element)->head.api_flag &= ~(f)) |