diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-04 18:00:40 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-04 18:14:25 +0300 |
| commit | bf7e8b42fa269c310e456fa55263ff2d9849804e (patch) | |
| tree | 571b8177bc7d854c865126e8c11b680577b0d98c /source/blender/bmesh/intern/bmesh_iterators_inline.h | |
| parent | 20e960215a80a41fd7e9782d009531d8d9f827cd (diff) | |
| parent | 1227e5c3d1ee20e9af57984a261b1d51d48c0263 (diff) | |
Merge branch 'master' into strand_editmode
Conflicts:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_mesh_conv.h
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_iterators_inline.h')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_iterators_inline.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.h b/source/blender/bmesh/intern/bmesh_iterators_inline.h index d46c14bf423..43b054d7845 100644 --- a/source/blender/bmesh/intern/bmesh_iterators_inline.h +++ b/source/blender/bmesh/intern/bmesh_iterators_inline.h @@ -39,6 +39,7 @@ * * Calls an iterators step function to return the next element. */ +ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE void *BM_iter_step(BMIter *iter) { return iter->step(iter); @@ -51,6 +52,7 @@ BLI_INLINE void *BM_iter_step(BMIter *iter) * it with the appropriate function pointers based * upon its type. */ +ATTR_NONNULL(1) BLI_INLINE bool BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *data) { /* int argtype; */ @@ -170,6 +172,7 @@ BLI_INLINE bool BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *da * to return the first element of the iterator. * */ +ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE void *BM_iter_new(BMIter *iter, BMesh *bm, const char itype, void *data) { if (LIKELY(BM_iter_init(iter, bm, itype, data))) { |