diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
| commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
| tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/bmesh/intern/bmesh_structure_inline.h | |
| parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
| parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) | |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_structure_inline.h')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_structure_inline.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_structure_inline.h b/source/blender/bmesh/intern/bmesh_structure_inline.h index 26d161693af..85a84dde4ad 100644 --- a/source/blender/bmesh/intern/bmesh_structure_inline.h +++ b/source/blender/bmesh/intern/bmesh_structure_inline.h @@ -20,8 +20,7 @@ * BMesh inline operator functions. */ -#ifndef __BMESH_STRUCTURE_INLINE_H__ -#define __BMESH_STRUCTURE_INLINE_H__ +#pragma once ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2) BLI_INLINE BMDiskLink *bmesh_disk_edge_link_from_vert(const BMEdge *e, const BMVert *v) @@ -72,5 +71,3 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2) BLI_INLINE BMEdge *bmesh_disk_edge_pr { return BM_DISK_EDGE_PREV(e, v); } - -#endif /* __BMESH_STRUCTURE_INLINE_H__ */ |