diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-12 12:20:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-12 12:20:48 +0300 |
| commit | f4d4047d805d315226214be292f2ece951fc1d76 (patch) | |
| tree | 24acb95f5d707b8b97e195166b394be76a563a45 /source/blender/bmesh | |
| parent | e387a4e768ea8328e2636eade5ed6a0be747f7a2 (diff) | |
| parent | d75b8e5f01d92a9bd4e92763f3d3b3bc4df75db4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_query.h | 6 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_query_inline.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_query.h b/source/blender/bmesh/intern/bmesh_query.h index cb3af88c316..51956761d8f 100644 --- a/source/blender/bmesh/intern/bmesh_query.h +++ b/source/blender/bmesh/intern/bmesh_query.h @@ -20,8 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __BMESH_QUERIES_H__ -#define __BMESH_QUERIES_H__ +#ifndef __BMESH_QUERY_H__ +#define __BMESH_QUERY_H__ /** \file blender/bmesh/intern/bmesh_query.h * \ingroup bmesh @@ -198,4 +198,4 @@ float bmesh_subd_falloff_calc(const int falloff, float val) ATTR_WARN_UNUSED_RES #include "bmesh_query_inline.h" -#endif /* __BMESH_QUERIES_H__ */ +#endif /* __BMESH_QUERY_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_query_inline.h b/source/blender/bmesh/intern/bmesh_query_inline.h index 1bd77d23ded..92be3639dce 100644 --- a/source/blender/bmesh/intern/bmesh_query_inline.h +++ b/source/blender/bmesh/intern/bmesh_query_inline.h @@ -23,8 +23,8 @@ */ -#ifndef __BMESH_QUERIES_INLINE_H__ -#define __BMESH_QUERIES_INLINE_H__ +#ifndef __BMESH_QUERY_INLINE_H__ +#define __BMESH_QUERY_INLINE_H__ /** * Returns whether or not a given vertex is @@ -166,4 +166,4 @@ BLI_INLINE bool BM_vert_is_wire_endpoint(const BMVert *v) return false; } -#endif /* __BMESH_QUERIES_INLINE_H__ */ +#endif /* __BMESH_QUERY_INLINE_H__ */ |