diff options
Diffstat (limited to 'source/blender/bmesh')
50 files changed, 50 insertions, 200 deletions
diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index c1f4b9daf27..5f5d6baaba2 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_H__ -#define __BMESH_H__ +#pragma once /** \file * \ingroup bmesh @@ -231,5 +230,3 @@ extern "C" { #ifdef __cplusplus } #endif - -#endif /* __BMESH_H__ */ diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index 1393e24e48e..edb355993c1 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_CLASS_H__ -#define __BMESH_CLASS_H__ +#pragma once /** \file * \ingroup bmesh @@ -472,5 +471,3 @@ typedef bool (*BMLoopFilterFunc)(const BMLoop *, void *user_data); #else # define BM_OMP_LIMIT 10000 #endif - -#endif /* __BMESH_CLASS_H__ */ diff --git a/source/blender/bmesh/bmesh_tools.h b/source/blender/bmesh/bmesh_tools.h index 4593f34792b..ee53cb9804d 100644 --- a/source/blender/bmesh/bmesh_tools.h +++ b/source/blender/bmesh/bmesh_tools.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_TOOLS_H__ -#define __BMESH_TOOLS_H__ +#pragma once /** \file * \ingroup bmesh @@ -45,5 +44,3 @@ extern "C" { #ifdef __cplusplus } #endif - -#endif /* __BMESH_TOOLS_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_callback_generic.h b/source/blender/bmesh/intern/bmesh_callback_generic.h index 5191bd31873..3f3a48fd546 100644 --- a/source/blender/bmesh/intern/bmesh_callback_generic.h +++ b/source/blender/bmesh/intern/bmesh_callback_generic.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_CALLBACK_GENERIC_H__ -#define __BMESH_CALLBACK_GENERIC_H__ +#pragma once /** \file * \ingroup bmesh @@ -35,5 +34,3 @@ bool BM_elem_cb_check_elem_not_equal(BMElem *ele, void *user_data); #define BM_elem_cb_check_hflag_disabled_simple(type, hflag_n) \ (bool (*)(type, void *)) BM_elem_cb_check_hflag_disabled, POINTER_FROM_UINT(hflag_n) - -#endif /* __BMESH_CALLBACK_GENERIC_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_construct.h b/source/blender/bmesh/intern/bmesh_construct.h index ae2b137d38a..3523c4aec1a 100644 --- a/source/blender/bmesh/intern/bmesh_construct.h +++ b/source/blender/bmesh/intern/bmesh_construct.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_CONSTRUCT_H__ -#define __BMESH_CONSTRUCT_H__ +#pragma once /** \file * \ingroup bmesh @@ -78,5 +77,3 @@ char BM_vert_flag_from_mflag(const char mflag); char BM_face_flag_to_mflag(BMFace *f); short BM_edge_flag_to_mflag(BMEdge *e); char BM_vert_flag_to_mflag(BMVert *v); - -#endif /* __BMESH_CONSTRUCT_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_core.h b/source/blender/bmesh/intern/bmesh_core.h index 3308f93d5d3..0e19437a527 100644 --- a/source/blender/bmesh/intern/bmesh_core.h +++ b/source/blender/bmesh/intern/bmesh_core.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_CORE_H__ -#define __BMESH_CORE_H__ +#pragma once /** \file * \ingroup bmesh @@ -128,5 +127,3 @@ BMFace *bmesh_kernel_join_face_kill_edge(BMesh *bm, BMFace *f1, BMFace *f2, BMEd BMVert *bmesh_kernel_unglue_region_make_vert(BMesh *bm, BMLoop *l_sep); BMVert *bmesh_kernel_unglue_region_make_vert_multi(BMesh *bm, BMLoop **larr, int larr_len); BMVert *bmesh_kernel_unglue_region_make_vert_multi_isolated(BMesh *bm, BMLoop *l_sep); - -#endif /* __BMESH_CORE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_delete.h b/source/blender/bmesh/intern/bmesh_delete.h index d41f26baddd..fcbcb8a90fc 100644 --- a/source/blender/bmesh/intern/bmesh_delete.h +++ b/source/blender/bmesh/intern/bmesh_delete.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_DELETE_H__ -#define __BMESH_DELETE_H__ +#pragma once /** \file * \ingroup bmesh @@ -26,5 +25,3 @@ void BM_mesh_delete_hflag_tagged(BMesh *bm, const char hflag, const char htype); void BMO_mesh_delete_oflag_context(BMesh *bm, const short oflag, const int type); void BM_mesh_delete_hflag_context(BMesh *bm, const char hflag, const int type); - -#endif /* __BMESH_DELETE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.h b/source/blender/bmesh/intern/bmesh_edgeloop.h index 4c76ea4f9cf..2e5c4d0193e 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.h +++ b/source/blender/bmesh/intern/bmesh_edgeloop.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BMESH_EDGELOOP_H__ -#define __BMESH_EDGELOOP_H__ +#pragma once /** \file * \ingroup bmesh @@ -84,5 +83,3 @@ bool BM_edgeloop_overlap_check(struct BMEdgeLoopStore *el_store_a, #define BM_EDGELOOP_NEXT(el_store) \ (CHECK_TYPE_INLINE(el_store, struct BMEdgeLoopStore *), \ (struct BMEdgeLoopStore *)((LinkData *)el_store)->next) - -#endif /* __BMESH_EDGELOOP_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_error.h b/source/blender/bmesh/intern/bmesh_error.h index 289b603d134..2307377fd71 100644 --- a/source/blender/bmesh/intern/bmesh_error.h +++ b/source/blender/bmesh/intern/bmesh_error.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_ERROR_H__ -#define __BMESH_ERROR_H__ +#pragma once /** \file * \ingroup bmesh @@ -84,5 +83,3 @@ enum { _BMESH_DUMMY_ABORT(), \ NULL)) : \ NULL) - -#endif /* __BMESH_ERROR_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.h index 13691776a27..203f44a540d 100644 --- a/source/blender/bmesh/intern/bmesh_inline.h +++ b/source/blender/bmesh/intern/bmesh_inline.h @@ -20,8 +20,7 @@ * BM Inline functions. */ -#ifndef __BMESH_INLINE_H__ -#define __BMESH_INLINE_H__ +#pragma once /* stuff for dealing with header flags */ #define BM_elem_flag_test(ele, hflag) _bm_elem_flag_test(&(ele)->head, hflag) @@ -135,5 +134,3 @@ BLI_INLINE int _bm_elem_index_get(const BMHeader *head) { return head->index; } - -#endif /* __BMESH_INLINE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_interp.h b/source/blender/bmesh/intern/bmesh_interp.h index bd3824ed3fd..0399b796cfd 100644 --- a/source/blender/bmesh/intern/bmesh_interp.h +++ b/source/blender/bmesh/intern/bmesh_interp.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_INTERP_H__ -#define __BMESH_INTERP_H__ +#pragma once /** \file * \ingroup bmesh @@ -82,5 +81,3 @@ void BM_vert_loop_groups_data_layer_merge_weights(BMesh *bm, struct LinkNode *groups, const int layer_n, const float *loop_weights); - -#endif /* __BMESH_INTERP_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_iterators.h b/source/blender/bmesh/intern/bmesh_iterators.h index a809c9a3d32..9314e23b21f 100644 --- a/source/blender/bmesh/intern/bmesh_iterators.h +++ b/source/blender/bmesh/intern/bmesh_iterators.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_ITERATORS_H__ -#define __BMESH_ITERATORS_H__ +#pragma once /** \file * \ingroup bmesh @@ -252,5 +251,3 @@ BMITER_CB_DEF(loop_of_face); (BM_ITER_CHECK_TYPE_DATA(data), BM_iter_new(iter, bm, itype, data)) #define BM_iter_init(iter, bm, itype, data) \ (BM_ITER_CHECK_TYPE_DATA(data), BM_iter_init(iter, bm, itype, data)) - -#endif /* __BMESH_ITERATORS_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.h b/source/blender/bmesh/intern/bmesh_iterators_inline.h index 4b9fbf52630..c384fb03cd9 100644 --- a/source/blender/bmesh/intern/bmesh_iterators_inline.h +++ b/source/blender/bmesh/intern/bmesh_iterators_inline.h @@ -20,8 +20,7 @@ * BMesh inline iterator functions. */ -#ifndef __BMESH_ITERATORS_INLINE_H__ -#define __BMESH_ITERATORS_INLINE_H__ +#pragma once /* inline here optimizes out the switch statement when called with * constant values (which is very common), nicer for loop-in-loop situations */ @@ -210,5 +209,3 @@ BLI_INLINE void BM_iter_parallel(BMesh *bm, } #endif /* __BLI_TASK_H__ */ - -#endif /* __BMESH_ITERATORS_INLINE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_log.h b/source/blender/bmesh/intern/bmesh_log.h index 25c58132802..5c0ca78bddf 100644 --- a/source/blender/bmesh/intern/bmesh_log.h +++ b/source/blender/bmesh/intern/bmesh_log.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_LOG_H__ -#define __BMESH_LOG_H__ +#pragma once /** \file * \ingroup bmesh @@ -98,5 +97,3 @@ void BM_log_original_vert_data(BMLog *log, BMVert *v, const float **r_co, const /* For internal use only (unit testing) */ BMLogEntry *BM_log_current_entry(BMLog *log); struct RangeTreeUInt *BM_log_unused_ids(BMLog *log); - -#endif diff --git a/source/blender/bmesh/intern/bmesh_marking.h b/source/blender/bmesh/intern/bmesh_marking.h index 06314a7a388..958980bdc23 100644 --- a/source/blender/bmesh/intern/bmesh_marking.h +++ b/source/blender/bmesh/intern/bmesh_marking.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_MARKING_H__ -#define __BMESH_MARKING_H__ +#pragma once /** \file * \ingroup bmesh @@ -137,5 +136,3 @@ void BM_select_history_merge_from_targetmap( (bm)->selected = _bm_prev_selected; \ } \ (void)0 - -#endif /* __BMESH_MARKING_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h index 0d665f1d391..a6b8b629ddf 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.h +++ b/source/blender/bmesh/intern/bmesh_mesh.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_MESH_H__ -#define __BMESH_MESH_H__ +#pragma once /** \file * \ingroup bmesh @@ -171,5 +170,3 @@ void BM_mesh_vert_coords_apply(BMesh *bm, const float (*orco)[3]); void BM_mesh_vert_coords_apply_with_mat4(BMesh *bm, const float (*vert_coords)[3], const float mat[4][4]); - -#endif /* __BMESH_MESH_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.h b/source/blender/bmesh/intern/bmesh_mesh_convert.h index 1ad43558c60..1b5d001d35d 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.h +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BMESH_MESH_CONV_H__ -#define __BMESH_MESH_CONV_H__ +#pragma once /** \file * \ingroup bmesh @@ -71,5 +70,3 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, struct Mesh *me, const struct CustomData_MeshMasks *cd_mask_extra) ATTR_NONNULL(1, 2); - -#endif /* __BMESH_MESH_CONV_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_mesh_duplicate.h b/source/blender/bmesh/intern/bmesh_mesh_duplicate.h index 17d4071b69f..8ace555d61f 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_duplicate.h +++ b/source/blender/bmesh/intern/bmesh_mesh_duplicate.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_MESH_DUPLICATE_H__ -#define __BMESH_MESH_DUPLICATE_H__ +#pragma once /** \file * \ingroup bmesh @@ -29,5 +28,3 @@ void BM_mesh_copy_arrays(BMesh *bm_src, uint edges_src_len, BMFace **faces_src, uint faces_src_len); - -#endif /* __BMESH_MESH_DUPLICATE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_mesh_validate.h b/source/blender/bmesh/intern/bmesh_mesh_validate.h index 32bb4fb023b..2112e1f3200 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_validate.h +++ b/source/blender/bmesh/intern/bmesh_mesh_validate.h @@ -17,13 +17,10 @@ * All rights reserved. */ -#ifndef __BMESH_MESH_VALIDATE_H__ -#define __BMESH_MESH_VALIDATE_H__ +#pragma once /** \file * \ingroup bmesh */ bool BM_mesh_validate(BMesh *bm); - -#endif /* __BMESH_MESH_VALIDATE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_mods.h b/source/blender/bmesh/intern/bmesh_mods.h index 36cb85bc9bc..8099d1dd603 100644 --- a/source/blender/bmesh/intern/bmesh_mods.h +++ b/source/blender/bmesh/intern/bmesh_mods.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_MODS_H__ -#define __BMESH_MODS_H__ +#pragma once /** \file * \ingroup bmesh @@ -94,5 +93,3 @@ enum { BMVert *BM_face_loop_separate(BMesh *bm, BMLoop *l_sep); BMVert *BM_face_loop_separate_multi_isolated(BMesh *bm, BMLoop *l_sep); BMVert *BM_face_loop_separate_multi(BMesh *bm, BMLoop **larr, int larr_len); - -#endif /* __BMESH_MODS_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_operator_api.h b/source/blender/bmesh/intern/bmesh_operator_api.h index 5af812d1b1d..a9282b8e5d0 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api.h +++ b/source/blender/bmesh/intern/bmesh_operator_api.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_OPERATOR_API_H__ -#define __BMESH_OPERATOR_API_H__ +#pragma once /** \file * \ingroup bmesh @@ -668,5 +667,3 @@ int BMO_opcode_from_opname(const char *opname); #ifdef __cplusplus } #endif - -#endif /* __BMESH_OPERATOR_API_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_operator_api_inline.h b/source/blender/bmesh/intern/bmesh_operator_api_inline.h index 2bda2d121c2..43628f01bc8 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api_inline.h +++ b/source/blender/bmesh/intern/bmesh_operator_api_inline.h @@ -20,8 +20,7 @@ * BMesh inline operator functions. */ -#ifndef __BMESH_OPERATOR_API_INLINE_H__ -#define __BMESH_OPERATOR_API_INLINE_H__ +#pragma once /* tool flag API. never, ever ever should tool code put junk in * header flags (element->head.flag), nor should they use @@ -236,5 +235,3 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE return NULL; } - -#endif /* __BMESH_OPERATOR_API_INLINE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h index c0e59758120..2f7d91c78c4 100644 --- a/source/blender/bmesh/intern/bmesh_operators.h +++ b/source/blender/bmesh/intern/bmesh_operators.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_OPERATORS_H__ -#define __BMESH_OPERATORS_H__ +#pragma once /** \file * \ingroup bmesh @@ -193,5 +192,3 @@ void BM_mesh_calc_uvs_cone(BMesh *bm, void BM_mesh_calc_uvs_cube(BMesh *bm, const short oflag); #include "intern/bmesh_operator_api_inline.h" - -#endif /* __BMESH_OPERATORS_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.h index 137c5aa338e..1c53c3d5c89 100644 --- a/source/blender/bmesh/intern/bmesh_operators_private.h +++ b/source/blender/bmesh/intern/bmesh_operators_private.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_OPERATORS_PRIVATE_H__ -#define __BMESH_OPERATORS_PRIVATE_H__ +#pragma once /** \file * \ingroup bmesh @@ -103,5 +102,3 @@ void bmo_triangulate_exec(BMesh *bm, BMOperator *op); void bmo_unsubdivide_exec(BMesh *bm, BMOperator *op); void bmo_weld_verts_exec(BMesh *bm, BMOperator *op); void bmo_wireframe_exec(BMesh *bm, BMOperator *op); - -#endif /* __BMESH_OPERATORS_PRIVATE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h index 1611bc0b893..d9413e303e3 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_POLYGON_H__ -#define __BMESH_POLYGON_H__ +#pragma once /** \file * \ingroup bmesh @@ -114,5 +113,3 @@ void BM_face_as_array_loop_quad(BMFace *f, BMLoop *r_loops[4]) ATTR_NONNULL(); void BM_vert_tri_calc_tangent_edge(BMVert *verts[3], float r_tangent[3]); void BM_vert_tri_calc_tangent_edge_pair(BMVert *verts[3], float r_tangent[3]); - -#endif /* __BMESH_POLYGON_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.h b/source/blender/bmesh/intern/bmesh_polygon_edgenet.h index 38af944d0cd..6833f067421 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.h +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_POLYGON_EDGENET_H__ -#define __BMESH_POLYGON_EDGENET_H__ +#pragma once /** \file * \ingroup bmesh @@ -37,5 +36,3 @@ bool BM_face_split_edgenet_connect_islands(BMesh *bm, BMEdge ***r_edge_net_new, uint *r_edge_net_new_len) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 6, 7, 8); - -#endif /* __BMESH_POLYGON_EDGENET_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h index 8b4a59d5b9b..2c3bac6df33 100644 --- a/source/blender/bmesh/intern/bmesh_private.h +++ b/source/blender/bmesh/intern/bmesh_private.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BMESH_PRIVATE_H__ -#define __BMESH_PRIVATE_H__ +#pragma once /** \file * \ingroup bmesh @@ -90,5 +89,3 @@ void poly_rotate_plane(const float normal[3], float (*verts)[3], const uint nver /* include the rest of our private declarations */ #include "bmesh_structure.h" - -#endif /* __BMESH_PRIVATE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_query.h b/source/blender/bmesh/intern/bmesh_query.h index 0d95efb778f..4ec6b0e50d1 100644 --- a/source/blender/bmesh/intern/bmesh_query.h +++ b/source/blender/bmesh/intern/bmesh_query.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_QUERY_H__ -#define __BMESH_QUERY_H__ +#pragma once /** \file * \ingroup bmesh @@ -273,5 +272,3 @@ int BM_mesh_calc_edge_groups_as_arrays(BMesh *bm, float bmesh_subd_falloff_calc(const int falloff, float val) ATTR_WARN_UNUSED_RESULT; #include "bmesh_query_inline.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 90919cc361b..8b12ccace20 100644 --- a/source/blender/bmesh/intern/bmesh_query_inline.h +++ b/source/blender/bmesh/intern/bmesh_query_inline.h @@ -18,8 +18,7 @@ * \ingroup bmesh */ -#ifndef __BMESH_QUERY_INLINE_H__ -#define __BMESH_QUERY_INLINE_H__ +#pragma once /** * Returns whether or not a given vertex is @@ -152,5 +151,3 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE bool BM_vert_is_wire_endpoint } return false; } - -#endif /* __BMESH_QUERY_INLINE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_query_uv.h b/source/blender/bmesh/intern/bmesh_query_uv.h index 2558f814f32..3465a831bea 100644 --- a/source/blender/bmesh/intern/bmesh_query_uv.h +++ b/source/blender/bmesh/intern/bmesh_query_uv.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_QUERY_UV_H__ -#define __BMESH_QUERY_UV_H__ +#pragma once /** \file * \ingroup bmesh @@ -54,5 +53,3 @@ bool BM_loop_uv_share_vert_check(BMLoop *l_a, BMLoop *l_b, const int cd_loop_uv_offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); - -#endif /* __BMESH_QUERY_UV_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_structure.h b/source/blender/bmesh/intern/bmesh_structure.h index 38c75dec354..b3b9536618c 100644 --- a/source/blender/bmesh/intern/bmesh_structure.h +++ b/source/blender/bmesh/intern/bmesh_structure.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BMESH_STRUCTURE_H__ -#define __BMESH_STRUCTURE_H__ +#pragma once /** \file * \ingroup bmesh @@ -93,5 +92,3 @@ BMEdge *bmesh_disk_edge_exists(const BMVert *v1, const BMVert *v2) ATTR_WARN_UNU bool bmesh_disk_validate(int len, BMEdge *e, BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); #include "intern/bmesh_structure_inline.h" - -#endif /* __BMESH_STRUCTURE_H__ */ 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__ */ diff --git a/source/blender/bmesh/intern/bmesh_walkers.h b/source/blender/bmesh/intern/bmesh_walkers.h index 0b862a5e9a1..a973e12a4c7 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.h +++ b/source/blender/bmesh/intern/bmesh_walkers.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_WALKERS_H__ -#define __BMESH_WALKERS_H__ +#pragma once /** \file * \ingroup bmesh @@ -130,5 +129,3 @@ enum { /* use with BMW_init, so as not to confuse with restrict flags */ #define BMW_NIL_LAY 0 - -#endif /* __BMESH_WALKERS_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_walkers_private.h b/source/blender/bmesh/intern/bmesh_walkers_private.h index 3457a2b9187..721f3c2c65b 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_private.h +++ b/source/blender/bmesh/intern/bmesh_walkers_private.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_WALKERS_PRIVATE_H__ -#define __BMESH_WALKERS_PRIVATE_H__ +#pragma once /** \file * \ingroup bmesh @@ -94,5 +93,3 @@ typedef struct BMwConnectedVertexWalker { BMwGenericWalker header; BMVert *curvert; } BMwConnectedVertexWalker; - -#endif /* __BMESH_WALKERS_PRIVATE_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_beautify.h b/source/blender/bmesh/tools/bmesh_beautify.h index d2c67693f73..d0fef828e7c 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.h +++ b/source/blender/bmesh/tools/bmesh_beautify.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_BEAUTIFY_H__ -#define __BMESH_BEAUTIFY_H__ +#pragma once /** \file * \ingroup bmesh @@ -42,5 +41,3 @@ float BM_verts_calc_rotate_beauty(const BMVert *v1, const BMVert *v4, const short flag, const short method); - -#endif /* __BMESH_BEAUTIFY_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_bevel.h b/source/blender/bmesh/tools/bmesh_bevel.h index 317ca05b68a..de57e1c62a9 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.h +++ b/source/blender/bmesh/tools/bmesh_bevel.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_BEVEL_H__ -#define __BMESH_BEVEL_H__ +#pragma once /** \file * \ingroup bmesh @@ -47,5 +46,3 @@ void BM_mesh_bevel(BMesh *bm, const float smoothresh, const struct CurveProfile *custom_profile, const int vmesh_method); - -#endif /* __BMESH_BEVEL_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.h b/source/blender/bmesh/tools/bmesh_bisect_plane.h index ca6281be99f..f64b5d8097c 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.h +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_BISECT_PLANE_H__ -#define __BMESH_BISECT_PLANE_H__ +#pragma once /** \file * \ingroup bmesh @@ -28,5 +27,3 @@ void BM_mesh_bisect_plane(BMesh *bm, const short oflag_center, const short oflag_new, const float eps); - -#endif /* __BMESH_BISECT_PLANE_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_decimate.h b/source/blender/bmesh/tools/bmesh_decimate.h index 669eb629e70..c62288c269a 100644 --- a/source/blender/bmesh/tools/bmesh_decimate.h +++ b/source/blender/bmesh/tools/bmesh_decimate.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_DECIMATE_H__ -#define __BMESH_DECIMATE_H__ +#pragma once /** \file * \ingroup bmesh @@ -45,5 +44,3 @@ void BM_mesh_decimate_dissolve(BMesh *bm, const float angle_limit, const bool do_dissolve_boundaries, const BMO_Delimit delimit); - -#endif /* __BMESH_DECIMATE_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_edgenet.h b/source/blender/bmesh/tools/bmesh_edgenet.h index 5db0e1170f3..7855b2e2886 100644 --- a/source/blender/bmesh/tools/bmesh_edgenet.h +++ b/source/blender/bmesh/tools/bmesh_edgenet.h @@ -14,13 +14,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_EDGENET_H__ -#define __BMESH_EDGENET_H__ +#pragma once /** \file * \ingroup bmesh */ void BM_mesh_edgenet(BMesh *bm, const bool use_edge_tag, const bool use_new_face_tag); - -#endif /* __BMESH_EDGENET_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.h b/source/blender/bmesh/tools/bmesh_edgesplit.h index 0b3884ec888..4b8c07fc992 100644 --- a/source/blender/bmesh/tools/bmesh_edgesplit.h +++ b/source/blender/bmesh/tools/bmesh_edgesplit.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_EDGESPLIT_H__ -#define __BMESH_EDGESPLIT_H__ +#pragma once /** \file * \ingroup bmesh @@ -25,5 +24,3 @@ void BM_mesh_edgesplit(BMesh *bm, const bool use_verts, const bool tag_only, const bool copy_select); - -#endif /* __BMESH_EDGESPLIT_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_intersect.h b/source/blender/bmesh/tools/bmesh_intersect.h index cbbc74d3f82..adb88f2fd76 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.h +++ b/source/blender/bmesh/tools/bmesh_intersect.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_INTERSECT_H__ -#define __BMESH_INTERSECT_H__ +#pragma once /** \file * \ingroup bmesh @@ -42,5 +41,3 @@ enum { BMESH_ISECT_BOOLEAN_UNION = 1, BMESH_ISECT_BOOLEAN_DIFFERENCE = 2, }; - -#endif /* __BMESH_INTERSECT_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.h b/source/blender/bmesh/tools/bmesh_intersect_edges.h index 7e2252250d6..2736b7a52f9 100644 --- a/source/blender/bmesh/tools/bmesh_intersect_edges.h +++ b/source/blender/bmesh/tools/bmesh_intersect_edges.h @@ -18,10 +18,7 @@ * \ingroup bmesh */ -#ifndef __BMESH_INTERSECT_EDGES_H__ -#define __BMESH_INTERSECT_EDGES_H__ +#pragma once bool BM_mesh_intersect_edges( BMesh *bm, const char hflag, const float dist, const bool split_faces, GHash *r_targetmap); - -#endif /* __BMESH_INTERSECT_EDGES_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_path.h b/source/blender/bmesh/tools/bmesh_path.h index 6d22a7e7e07..79c3d3a5d63 100644 --- a/source/blender/bmesh/tools/bmesh_path.h +++ b/source/blender/bmesh/tools/bmesh_path.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_PATH_H__ -#define __BMESH_PATH_H__ +#pragma once /** \file * \ingroup bmesh @@ -49,5 +48,3 @@ struct LinkNode *BM_mesh_calc_path_face(BMesh *bm, bool (*filter_fn)(BMFace *, void *), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5); - -#endif /* __BMESH_PATH_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_path_region.h b/source/blender/bmesh/tools/bmesh_path_region.h index 5204aa45da2..99a5b4a0960 100644 --- a/source/blender/bmesh/tools/bmesh_path_region.h +++ b/source/blender/bmesh/tools/bmesh_path_region.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_PATH_REGION_H__ -#define __BMESH_PATH_REGION_H__ +#pragma once /** \file * \ingroup bmesh @@ -41,5 +40,3 @@ struct LinkNode *BM_mesh_calc_path_region_face(BMesh *bm, bool (*test_fn)(BMFace *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); - -#endif /* __BMESH_PATH_REGION_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_path_region_uv.h b/source/blender/bmesh/tools/bmesh_path_region_uv.h index 16e627ab461..18fe977c9fa 100644 --- a/source/blender/bmesh/tools/bmesh_path_region_uv.h +++ b/source/blender/bmesh/tools/bmesh_path_region_uv.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_PATH_REGION_UV_H__ -#define __BMESH_PATH_REGION_UV_H__ +#pragma once /** \file * \ingroup bmesh @@ -44,5 +43,3 @@ struct LinkNode *BM_mesh_calc_path_uv_region_face(BMesh *bm, bool (*test_fn)(BMFace *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); - -#endif /* __BMESH_PATH_REGION_UV_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_path_uv.h b/source/blender/bmesh/tools/bmesh_path_uv.h index c7c5768f7d0..5f35d2c1594 100644 --- a/source/blender/bmesh/tools/bmesh_path_uv.h +++ b/source/blender/bmesh/tools/bmesh_path_uv.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_PATH_UV_H__ -#define __BMESH_PATH_UV_H__ +#pragma once /** \file * \ingroup bmesh @@ -43,5 +42,3 @@ struct LinkNode *BM_mesh_calc_path_uv_face(BMesh *bm, bool (*filter_fn)(BMFace *, void *), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5); - -#endif /* __BMESH_PATH_UV_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_region_match.h b/source/blender/bmesh/tools/bmesh_region_match.h index a0625543c51..799af938c31 100644 --- a/source/blender/bmesh/tools/bmesh_region_match.h +++ b/source/blender/bmesh/tools/bmesh_region_match.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_REGION_MATCH_H__ -#define __BMESH_REGION_MATCH_H__ +#pragma once /** \file * \ingroup bmesh @@ -25,5 +24,3 @@ int BM_mesh_region_match(BMesh *bm, BMFace **faces_region, uint faces_region_len, ListBase *r_face_regions); - -#endif /* __BMESH_REGION_MATCH_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_separate.h b/source/blender/bmesh/tools/bmesh_separate.h index 13293b155fd..9260903a8fa 100644 --- a/source/blender/bmesh/tools/bmesh_separate.h +++ b/source/blender/bmesh/tools/bmesh_separate.h @@ -14,13 +14,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BMESH_SEPARATE_H__ -#define __BMESH_SEPARATE_H__ +#pragma once /** \file * \ingroup bmesh */ void BM_mesh_separate_faces(BMesh *bm, BMFaceFilterFunc filter_fn, void *user_data); - -#endif /* __BMESH_SEPARATE_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_triangulate.h b/source/blender/bmesh/tools/bmesh_triangulate.h index ababd78f9a1..5353b315a38 100644 --- a/source/blender/bmesh/tools/bmesh_triangulate.h +++ b/source/blender/bmesh/tools/bmesh_triangulate.h @@ -20,8 +20,7 @@ * Triangulate. */ -#ifndef __BMESH_TRIANGULATE_H__ -#define __BMESH_TRIANGULATE_H__ +#pragma once void BM_mesh_triangulate(BMesh *bm, const int quad_method, @@ -31,5 +30,3 @@ void BM_mesh_triangulate(BMesh *bm, BMOperator *op, BMOpSlot *slot_facemap_out, BMOpSlot *slot_doubles_out); - -#endif /* __BMESH_TRIANGULATE_H__ */ diff --git a/source/blender/bmesh/tools/bmesh_wireframe.h b/source/blender/bmesh/tools/bmesh_wireframe.h index 3be43b2e9f5..b2c2f5f5523 100644 --- a/source/blender/bmesh/tools/bmesh_wireframe.h +++ b/source/blender/bmesh/tools/bmesh_wireframe.h @@ -20,8 +20,7 @@ * Wire Frame. */ -#ifndef __BMESH_WIREFRAME_H__ -#define __BMESH_WIREFRAME_H__ +#pragma once void BM_mesh_wireframe(BMesh *bm, const float offset, @@ -38,5 +37,3 @@ void BM_mesh_wireframe(BMesh *bm, const short mat_offset, const short mat_max, const bool use_tag); - -#endif /* __BMESH_WIREFRAME_H__ */ |