diff options
author | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
commit | 7283e6fb73490ddd23425ba2cf06cda7ac8f9458 (patch) | |
tree | 7c0c7069a44743b7462d3ed271bedeb09300ec4f /source/blender/modifiers | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/modifiers')
6 files changed, 6 insertions, 22 deletions
diff --git a/source/blender/modifiers/MOD_modifiertypes.h b/source/blender/modifiers/MOD_modifiertypes.h index ba676bbe459..b011abf336d 100644 --- a/source/blender/modifiers/MOD_modifiertypes.h +++ b/source/blender/modifiers/MOD_modifiertypes.h @@ -18,8 +18,7 @@ * \ingroup modifiers */ -#ifndef __MOD_MODIFIERTYPES_H__ -#define __MOD_MODIFIERTYPES_H__ +#pragma once #include "BKE_modifier.h" @@ -94,5 +93,3 @@ void modifier_type_init(ModifierTypeInfo *types[]); #ifdef __cplusplus } #endif - -#endif /* __MOD_MODIFIERTYPES_H__ */ diff --git a/source/blender/modifiers/intern/MOD_meshcache_util.h b/source/blender/modifiers/intern/MOD_meshcache_util.h index 0a6c0e73632..74131099e3c 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_util.h +++ b/source/blender/modifiers/intern/MOD_meshcache_util.h @@ -18,8 +18,7 @@ * \ingroup modifiers */ -#ifndef __MOD_MESHCACHE_UTIL_H__ -#define __MOD_MESHCACHE_UTIL_H__ +#pragma once /* MOD_meshcache_mdd.c */ bool MOD_meshcache_read_mdd_index(FILE *fp, @@ -73,5 +72,3 @@ void MOD_meshcache_calc_range(const float frame, float *r_factor); #define FRAME_SNAP_EPS 0.0001f - -#endif /* __MOD_MESHCACHE_UTIL_H__ */ diff --git a/source/blender/modifiers/intern/MOD_solidify_util.h b/source/blender/modifiers/intern/MOD_solidify_util.h index 6ab4734c451..e9f0709f7ea 100644 --- a/source/blender/modifiers/intern/MOD_solidify_util.h +++ b/source/blender/modifiers/intern/MOD_solidify_util.h @@ -18,8 +18,7 @@ * \ingroup modifiers */ -#ifndef __MOD_SOLIDIFY_UTIL_H__ -#define __MOD_SOLIDIFY_UTIL_H__ +#pragma once /* MOD_solidify_extrude.c */ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, @@ -30,5 +29,3 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh); - -#endif /* __MOD_SOLIDIFY_UTIL_H__ */ diff --git a/source/blender/modifiers/intern/MOD_ui_common.h b/source/blender/modifiers/intern/MOD_ui_common.h index 59c0fe1c413..cac8806a2bf 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.h +++ b/source/blender/modifiers/intern/MOD_ui_common.h @@ -18,8 +18,7 @@ * \ingroup modifiers */ -#ifndef __MOD_UI_COMMON_H__ -#define __MOD_UI_COMMON_H__ +#pragma once /* so modifier types match their defines */ #include "MOD_modifiertypes.h" @@ -66,5 +65,3 @@ struct PanelType *modifier_subpanel_register(struct ARegionType *region_type, #ifdef __cplusplus } #endif - -#endif /* __MOD_UI_COMMON_H__ */ diff --git a/source/blender/modifiers/intern/MOD_util.h b/source/blender/modifiers/intern/MOD_util.h index a05e25d204c..05a24b92242 100644 --- a/source/blender/modifiers/intern/MOD_util.h +++ b/source/blender/modifiers/intern/MOD_util.h @@ -18,8 +18,7 @@ * \ingroup modifiers */ -#ifndef __MOD_UTIL_H__ -#define __MOD_UTIL_H__ +#pragma once /* so modifier types match their defines */ #include "MOD_modifiertypes.h" @@ -60,4 +59,3 @@ void MOD_depsgraph_update_object_bone_relation(struct DepsNodeHandle *node, struct Object *object, const char *bonename, const char *description); -#endif /* __MOD_UTIL_H__ */ diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h index 725574dc0a5..c00acd27d38 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.h +++ b/source/blender/modifiers/intern/MOD_weightvg_util.h @@ -21,8 +21,7 @@ * \ingroup modifiers */ -#ifndef __MOD_WEIGHTVG_UTIL_H__ -#define __MOD_WEIGHTVG_UTIL_H__ +#pragma once struct CurveMapping; struct MDeformVert; @@ -92,4 +91,3 @@ void weightvg_update_vg(struct MDeformVert *dvert, const bool do_normalize); void weightvg_ui_common(const bContext *C, PointerRNA *ob_ptr, PointerRNA *ptr, uiLayout *layout); -#endif /* __MOD_WEIGHTVG_UTIL_H__ */ |