blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-07-12 11:20:48 +02:00
parent e387a4e768 d75b8e5f01
commit f4d4047d80
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/bmesh/intern/bmesh_query.h
View File

@ -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__ */

6
source/blender/bmesh/intern/bmesh_query_inline.h
View File

@ -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__ */