diff options
Diffstat (limited to 'source/blender/blenkernel')
159 files changed, 159 insertions, 635 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 32f82d9d9a2..76c610fb5bd 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_DERIVEDMESH_H__ -#define __BKE_DERIVEDMESH_H__ +#pragma once /** \file * \ingroup bke @@ -389,5 +388,3 @@ bool DM_is_valid(DerivedMesh *dm); #ifdef __cplusplus } #endif - -#endif /* __BKE_DERIVEDMESH_H__ */ diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h index c3cfd4b33ea..e08604f02ad 100644 --- a/source/blender/blenkernel/BKE_action.h +++ b/source/blender/blenkernel/BKE_action.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_ACTION_H__ -#define __BKE_ACTION_H__ +#pragma once /** \file * \ingroup bke @@ -223,5 +222,3 @@ void BKE_pose_tag_recalc(struct Main *bmain, struct bPose *pose); #ifdef __cplusplus }; #endif - -#endif diff --git a/source/blender/blenkernel/BKE_addon.h b/source/blender/blenkernel/BKE_addon.h index 741be17bb25..73e3f6e41dc 100644 --- a/source/blender/blenkernel/BKE_addon.h +++ b/source/blender/blenkernel/BKE_addon.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_ADDON_H__ -#define __BKE_ADDON_H__ +#pragma once /** \file * \ingroup bke @@ -56,5 +55,3 @@ void BKE_addon_free(struct bAddon *addon); #ifdef __cplusplus } #endif - -#endif /* __BKE_ADDON_H__ */ diff --git a/source/blender/blenkernel/BKE_anim_data.h b/source/blender/blenkernel/BKE_anim_data.h index 48e95740b9d..189e45f4fe5 100644 --- a/source/blender/blenkernel/BKE_anim_data.h +++ b/source/blender/blenkernel/BKE_anim_data.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_ANIM_DATA_H__ -#define __BKE_ANIM_DATA_H__ +#pragma once /** \file * \ingroup bke @@ -98,5 +97,3 @@ void BKE_animdata_merge_copy(struct Main *bmain, #ifdef __cplusplus } #endif - -#endif /* __BKE_ANIM_DATA_H__*/ diff --git a/source/blender/blenkernel/BKE_anim_path.h b/source/blender/blenkernel/BKE_anim_path.h index 4de853303ad..ae2d13530ed 100644 --- a/source/blender/blenkernel/BKE_anim_path.h +++ b/source/blender/blenkernel/BKE_anim_path.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_ANIM_PATH_H__ -#define __BKE_ANIM_PATH_H__ +#pragma once /** \file * \ingroup bke @@ -47,5 +46,3 @@ bool where_on_path(const struct Object *ob, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_anim_visualization.h b/source/blender/blenkernel/BKE_anim_visualization.h index 5dcbfa0919e..fb7875a112e 100644 --- a/source/blender/blenkernel/BKE_anim_visualization.h +++ b/source/blender/blenkernel/BKE_anim_visualization.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_ANIM_VISUALIZATION_H__ -#define __BKE_ANIM_VISUALIZATION_H__ +#pragma once /** \file * \ingroup bke @@ -52,5 +51,3 @@ struct bMotionPath *animviz_verify_motionpaths(struct ReportList *reports, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h index 583cac79d8e..ef74bb61a7e 100644 --- a/source/blender/blenkernel/BKE_animsys.h +++ b/source/blender/blenkernel/BKE_animsys.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_ANIMSYS_H__ -#define __BKE_ANIMSYS_H__ +#pragma once /** \file * \ingroup bke @@ -276,5 +275,3 @@ void BKE_animsys_update_driver_array(struct ID *id); #ifdef __cplusplus } #endif - -#endif /* __BKE_ANIMSYS_H__*/ diff --git a/source/blender/blenkernel/BKE_appdir.h b/source/blender/blenkernel/BKE_appdir.h index e49fc260810..b8a4497c7be 100644 --- a/source/blender/blenkernel/BKE_appdir.h +++ b/source/blender/blenkernel/BKE_appdir.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_APPDIR_H__ -#define __BKE_APPDIR_H__ +#pragma once /** \file * \ingroup bli @@ -101,5 +100,3 @@ enum { #ifdef __cplusplus } #endif - -#endif /* __BKE_APPDIR_H__ */ diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index 301aa4538a7..6d48397b1af 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_ARMATURE_H__ -#define __BKE_ARMATURE_H__ +#pragma once /** \file * \ingroup bke @@ -389,5 +388,3 @@ void BKE_armature_deform_coords_with_editmesh(const struct Object *ob_arm, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_autoexec.h b/source/blender/blenkernel/BKE_autoexec.h index bb847d49a4b..84d83ae5d30 100644 --- a/source/blender/blenkernel/BKE_autoexec.h +++ b/source/blender/blenkernel/BKE_autoexec.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_AUTOEXEC_H__ -#define __BKE_AUTOEXEC_H__ +#pragma once /** \file * \ingroup bke @@ -29,5 +28,3 @@ bool BKE_autoexec_match(const char *path); #ifdef __cplusplus } #endif - -#endif /* __BKE_AUTOEXEC_H__ */ diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 3feba4b3a66..abc0ce1f092 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_BLENDER_H__ -#define __BKE_BLENDER_H__ +#pragma once /** \file * \ingroup bke @@ -54,5 +53,3 @@ void BKE_blender_atexit(void); #ifdef __cplusplus } #endif - -#endif /* __BKE_BLENDER_H__ */ diff --git a/source/blender/blenkernel/BKE_blender_copybuffer.h b/source/blender/blenkernel/BKE_blender_copybuffer.h index ca20d3d9bba..1dd6d495276 100644 --- a/source/blender/blenkernel/BKE_blender_copybuffer.h +++ b/source/blender/blenkernel/BKE_blender_copybuffer.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_BLENDER_COPYBUFFER_H__ -#define __BKE_BLENDER_COPYBUFFER_H__ +#pragma once /** \file * \ingroup bke @@ -48,5 +47,3 @@ int BKE_copybuffer_paste(struct bContext *C, #ifdef __cplusplus } #endif - -#endif /* __BKE_BLENDER_COPYBUFFER_H__ */ diff --git a/source/blender/blenkernel/BKE_blender_undo.h b/source/blender/blenkernel/BKE_blender_undo.h index 4ecedbbfc1e..e5ce91df3fb 100644 --- a/source/blender/blenkernel/BKE_blender_undo.h +++ b/source/blender/blenkernel/BKE_blender_undo.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_BLENDER_UNDO_H__ -#define __BKE_BLENDER_UNDO_H__ +#pragma once /** \file * \ingroup bke @@ -41,5 +40,3 @@ void BKE_memfile_undo_free(struct MemFileUndoData *mfu); #ifdef __cplusplus } #endif - -#endif /* __BKE_BLENDER_UNDO_H__ */ diff --git a/source/blender/blenkernel/BKE_blender_user_menu.h b/source/blender/blenkernel/BKE_blender_user_menu.h index 805a343b976..8d00cde488e 100644 --- a/source/blender/blenkernel/BKE_blender_user_menu.h +++ b/source/blender/blenkernel/BKE_blender_user_menu.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_BLENDER_USER_MENU_H__ -#define __BKE_BLENDER_USER_MENU_H__ +#pragma once /** \file * \ingroup bke @@ -43,5 +42,3 @@ void BKE_blender_user_menu_item_free_list(struct ListBase *lb); #ifdef __cplusplus } #endif - -#endif /* __BKE_BLENDER_USER_MENU_H__ */ diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 77d2a973c50..797c4f9f355 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_BLENDER_VERSION_H__ -#define __BKE_BLENDER_VERSION_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -54,5 +53,3 @@ const char *BKE_blender_version_string(void); #ifdef __cplusplus } #endif - -#endif /* __BKE_BLENDER_VERSION_H__ */ diff --git a/source/blender/blenkernel/BKE_blendfile.h b/source/blender/blenkernel/BKE_blendfile.h index e835137bfa1..94d203eeb2c 100644 --- a/source/blender/blenkernel/BKE_blendfile.h +++ b/source/blender/blenkernel/BKE_blendfile.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_BLENDFILE_H__ -#define __BKE_BLENDFILE_H__ +#pragma once /** \file * \ingroup bke @@ -81,5 +80,3 @@ void BKE_blendfile_write_partial_end(struct Main *bmain_src); #ifdef __cplusplus } #endif - -#endif /* __BKE_BLENDFILE_H__ */ diff --git a/source/blender/blenkernel/BKE_boids.h b/source/blender/blenkernel/BKE_boids.h index f9fd814b5f2..c9e6f0e7346 100644 --- a/source/blender/blenkernel/BKE_boids.h +++ b/source/blender/blenkernel/BKE_boids.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_BOIDS_H__ -#define __BKE_BOIDS_H__ +#pragma once /** \file * \ingroup bke @@ -62,5 +61,3 @@ BoidState *boid_get_current_state(BoidSettings *boids); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_bpath.h b/source/blender/blenkernel/BKE_bpath.h index cc8dd0d5b33..787dc4d1147 100644 --- a/source/blender/blenkernel/BKE_bpath.h +++ b/source/blender/blenkernel/BKE_bpath.h @@ -20,8 +20,7 @@ * so for BPath we don't need to malloc */ -#ifndef __BKE_BPATH_H__ -#define __BKE_BPATH_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -92,5 +91,3 @@ void BKE_bpath_absolute_convert(struct Main *bmain, #ifdef __cplusplus } #endif - -#endif /* __BKE_BPATH_H__ */ diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 4e9430ab3e1..af299c917eb 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_BRUSH_H__ -#define __BKE_BRUSH_H__ +#pragma once /** \file * \ingroup bke @@ -157,5 +156,3 @@ void BKE_brush_debug_print_state(struct Brush *br); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index 5d7e8fe743e..e973bee9e20 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2006 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_BVHUTILS_H__ -#define __BKE_BVHUTILS_H__ +#pragma once /** \file * \ingroup bke @@ -263,5 +262,3 @@ void bvhcache_free(struct BVHCache *bvh_cache); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_cachefile.h b/source/blender/blenkernel/BKE_cachefile.h index 596085f9c6f..9912b4e4b70 100644 --- a/source/blender/blenkernel/BKE_cachefile.h +++ b/source/blender/blenkernel/BKE_cachefile.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_CACHEFILE_H__ -#define __BKE_CACHEFILE_H__ +#pragma once /** \file * \ingroup bke @@ -66,5 +65,3 @@ void BKE_cachefile_reader_free(struct CacheFile *cache_file, struct CacheReader #ifdef __cplusplus } #endif - -#endif /* __BKE_CACHEFILE_H__ */ diff --git a/source/blender/blenkernel/BKE_callbacks.h b/source/blender/blenkernel/BKE_callbacks.h index 284948da634..fadba5644de 100644 --- a/source/blender/blenkernel/BKE_callbacks.h +++ b/source/blender/blenkernel/BKE_callbacks.h @@ -18,8 +18,7 @@ * \ingroup bke */ -#ifndef __BKE_CALLBACKS_H__ -#define __BKE_CALLBACKS_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -88,5 +87,3 @@ void BKE_callback_global_finalize(void); #ifdef __cplusplus } #endif - -#endif /* __BKE_CALLBACKS_H__ */ diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index 812f5d520d7..533d5ae13cd 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_CAMERA_H__ -#define __BKE_CAMERA_H__ +#pragma once /** \file * \ingroup bke @@ -167,5 +166,3 @@ void BKE_camera_background_image_clear(struct Camera *cam); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_ccg.h b/source/blender/blenkernel/BKE_ccg.h index ad1e05ee367..acdaa81da8d 100644 --- a/source/blender/blenkernel/BKE_ccg.h +++ b/source/blender/blenkernel/BKE_ccg.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_CCG_H__ -#define __BKE_CCG_H__ +#pragma once /** \file * \ingroup bke @@ -166,5 +165,3 @@ BLI_INLINE CCGElem *CCG_elem_next(const CCGKey *key, CCGElem *elem) #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index dd7d20c0407..e997678001f 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -26,8 +26,7 @@ * \note This is deprecated & should eventually be removed. */ -#ifndef __BKE_CDDERIVEDMESH_H__ -#define __BKE_CDDERIVEDMESH_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -49,5 +48,3 @@ struct DerivedMesh *CDDM_copy(struct DerivedMesh *dm); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index cd78746a3f0..5af37829577 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) Blender Foundation. * All rights reserved. */ -#ifndef __BKE_CLOTH_H__ -#define __BKE_CLOTH_H__ +#pragma once /** \file * \ingroup bke @@ -307,5 +306,3 @@ void cloth_parallel_transport_hair_frame(float mat[3][3], #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h index 25bc2006ee3..f4393742dff 100644 --- a/source/blender/blenkernel/BKE_collection.h +++ b/source/blender/blenkernel/BKE_collection.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_COLLECTION_H__ -#define __BKE_COLLECTION_H__ +#pragma once /** \file * \ingroup bke @@ -255,5 +254,3 @@ void BKE_scene_objects_iterator_end(struct BLI_Iterator *iter); #ifdef __cplusplus } #endif - -#endif /* __BKE_COLLECTION_H__ */ diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index c3ecd0b7ed0..579adb61057 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) Blender Foundation. * All rights reserved. */ -#ifndef __BKE_COLLISION_H__ -#define __BKE_COLLISION_H__ +#pragma once /** \file * \ingroup bke @@ -178,5 +177,3 @@ void BKE_collider_cache_free(struct ListBase **colliders); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_colorband.h b/source/blender/blenkernel/BKE_colorband.h index 355682671fe..6ac96a1ed36 100644 --- a/source/blender/blenkernel/BKE_colorband.h +++ b/source/blender/blenkernel/BKE_colorband.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_COLORBAND_H__ -#define __BKE_COLORBAND_H__ +#pragma once /** \file * \ingroup bke @@ -47,5 +46,3 @@ void BKE_colorband_update_sort(struct ColorBand *coba); #ifdef __cplusplus } #endif - -#endif /* __BKE_COLORBAND_H__ */ diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h index 0623e0e5395..5a68514a387 100644 --- a/source/blender/blenkernel/BKE_colortools.h +++ b/source/blender/blenkernel/BKE_colortools.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2006 Blender Foundation. * All rights reserved. */ -#ifndef __BKE_COLORTOOLS_H__ -#define __BKE_COLORTOOLS_H__ +#pragma once /** \file * \ingroup bke @@ -152,5 +151,3 @@ bool BKE_color_managed_colorspace_settings_equals( #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h index 8d7fe875c37..94349f4db22 100644 --- a/source/blender/blenkernel/BKE_constraint.h +++ b/source/blender/blenkernel/BKE_constraint.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_CONSTRAINT_H__ -#define __BKE_CONSTRAINT_H__ +#pragma once /** \file * \ingroup bke @@ -224,5 +223,3 @@ void BKE_constraints_solve(struct Depsgraph *depsgraph, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index 7544789d864..eb26f1c3969 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_CONTEXT_H__ -#define __BKE_CONTEXT_H__ +#pragma once /** \file * \ingroup bke @@ -346,5 +345,3 @@ struct Depsgraph *CTX_data_depsgraph_on_load(const bContext *C); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_crazyspace.h b/source/blender/blenkernel/BKE_crazyspace.h index 6ac6b17d468..b95be70379f 100644 --- a/source/blender/blenkernel/BKE_crazyspace.h +++ b/source/blender/blenkernel/BKE_crazyspace.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_CRAZYSPACE_H__ -#define __BKE_CRAZYSPACE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -65,5 +64,3 @@ void BKE_crazyspace_build_sculpt(struct Depsgraph *depsgraph, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index 3f7b978287d..0bd4e3a7582 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_CURVE_H__ -#define __BKE_CURVE_H__ +#pragma once /** \file * \ingroup bke @@ -339,5 +338,3 @@ void BKE_curve_deform_co(const struct Object *ob_curve, #ifdef __cplusplus } #endif - -#endif /* __BKE_CURVE_H__ */ diff --git a/source/blender/blenkernel/BKE_curveprofile.h b/source/blender/blenkernel/BKE_curveprofile.h index 877ab887138..84dbcd25b32 100644 --- a/source/blender/blenkernel/BKE_curveprofile.h +++ b/source/blender/blenkernel/BKE_curveprofile.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_CURVEPROFILE_H__ -#define __BKE_CURVEPROFILE_H__ +#pragma once /** \file * \ingroup bke @@ -101,5 +100,3 @@ void BKE_curveprofile_blend_read(struct BlendDataReader *reader, struct CurvePro #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 3ef719cb73b..92bfa3a9490 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -22,8 +22,7 @@ * \brief CustomData interface, see also DNA_customdata_types.h. */ -#ifndef __BKE_CUSTOMDATA_H__ -#define __BKE_CUSTOMDATA_H__ +#pragma once #include "BLI_sys_types.h" #include "BLI_utildefines.h" @@ -575,5 +574,3 @@ void CustomData_data_transfer(const struct MeshPairRemap *me_remap, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_customdata_file.h b/source/blender/blenkernel/BKE_customdata_file.h index 2be2f71a168..f9f02204bb9 100644 --- a/source/blender/blenkernel/BKE_customdata_file.h +++ b/source/blender/blenkernel/BKE_customdata_file.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_CUSTOMDATA_FILE_H__ -#define __BKE_CUSTOMDATA_FILE_H__ +#pragma once /** \file * \ingroup bke @@ -60,5 +59,3 @@ CDataFileLayer *cdf_layer_add(CDataFile *cdf, int type, const char *name, size_t #ifdef __cplusplus } #endif - -#endif /* __BKE_CUSTOMDATA_FILE_H__ */ diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h index a723a9ed38c..d861baba14d 100644 --- a/source/blender/blenkernel/BKE_data_transfer.h +++ b/source/blender/blenkernel/BKE_data_transfer.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_DATA_TRANSFER_H__ -#define __BKE_DATA_TRANSFER_H__ +#pragma once #include "BKE_customdata.h" @@ -181,5 +180,3 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, #ifdef __cplusplus } #endif - -#endif /* __BKE_DATA_TRANSFER_H__ */ diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index f59e796c98c..35111d5240e 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_DEFORM_H__ -#define __BKE_DEFORM_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -166,5 +165,3 @@ void BKE_defvert_weight_to_rgb(float r_rgb[3], const float weight); #ifdef __cplusplus } #endif - -#endif /* __BKE_DEFORM_H__ */ diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h index b7e4acdc636..7e1a6e54ede 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_DISPLIST_H__ -#define __BKE_DISPLIST_H__ +#pragma once /** \file * \ingroup bke @@ -119,5 +118,3 @@ void BKE_displist_minmax(struct ListBase *dispbase, float min[3], float max[3]); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_displist_tangent.h b/source/blender/blenkernel/BKE_displist_tangent.h index 5e1c6ac8a21..c91c2c97dda 100644 --- a/source/blender/blenkernel/BKE_displist_tangent.h +++ b/source/blender/blenkernel/BKE_displist_tangent.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_DISPLIST_TANGENT_H__ -#define __BKE_DISPLIST_TANGENT_H__ +#pragma once /** \file * \ingroup bke @@ -30,5 +29,3 @@ void BKE_displist_tangent_calc(const DispList *dl, float (*fnormals)[3], float ( #ifdef __cplusplus } #endif - -#endif /* __BKE_DISPLIST_TANGENT_H__ */ diff --git a/source/blender/blenkernel/BKE_duplilist.h b/source/blender/blenkernel/BKE_duplilist.h index 13918dd4fb1..c142d5338d1 100644 --- a/source/blender/blenkernel/BKE_duplilist.h +++ b/source/blender/blenkernel/BKE_duplilist.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_DUPLILIST_H__ -#define __BKE_DUPLILIST_H__ +#pragma once /** \file * \ingroup bke @@ -64,5 +63,3 @@ typedef struct DupliObject { #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index 5e3603a8339..99b58b2f40a 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_DYNAMICPAINT_H__ -#define __BKE_DYNAMICPAINT_H__ +#pragma once /** \file * \ingroup bke @@ -124,5 +123,3 @@ void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface, #ifdef __cplusplus } #endif - -#endif /* __BKE_DYNAMICPAINT_H__ */ diff --git a/source/blender/blenkernel/BKE_editlattice.h b/source/blender/blenkernel/BKE_editlattice.h index c587ddb551b..be791487c27 100644 --- a/source/blender/blenkernel/BKE_editlattice.h +++ b/source/blender/blenkernel/BKE_editlattice.h @@ -18,8 +18,7 @@ * \ingroup bke */ -#ifndef __BKE_EDITLATTICE_H__ -#define __BKE_EDITLATTICE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -34,5 +33,3 @@ void BKE_editlattice_load(struct Object *obedit); #ifdef __cplusplus } #endif - -#endif /* __BKE_EDITLATTICE_H__ */ diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h index 9bd62858902..819e91b438e 100644 --- a/source/blender/blenkernel/BKE_editmesh.h +++ b/source/blender/blenkernel/BKE_editmesh.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_EDITMESH_H__ -#define __BKE_EDITMESH_H__ +#pragma once /** \file * \ingroup bke @@ -107,5 +106,3 @@ struct BoundBox *BKE_editmesh_cage_boundbox_get(BMEditMesh *em); #ifdef __cplusplus } #endif - -#endif /* __BKE_EDITMESH_H__ */ diff --git a/source/blender/blenkernel/BKE_editmesh_bvh.h b/source/blender/blenkernel/BKE_editmesh_bvh.h index b8d1e26fad2..8f8e573ee2f 100644 --- a/source/blender/blenkernel/BKE_editmesh_bvh.h +++ b/source/blender/blenkernel/BKE_editmesh_bvh.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_EDITMESH_BVH_H__ -#define __BKE_EDITMESH_BVH_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -104,5 +103,3 @@ enum { #ifdef __cplusplus } #endif - -#endif /* __BKE_EDITMESH_BVH_H__ */ diff --git a/source/blender/blenkernel/BKE_editmesh_cache.h b/source/blender/blenkernel/BKE_editmesh_cache.h index 6c812098b2e..bc2a70124fe 100644 --- a/source/blender/blenkernel/BKE_editmesh_cache.h +++ b/source/blender/blenkernel/BKE_editmesh_cache.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_EDITMESH_CACHE_H__ -#define __BKE_EDITMESH_CACHE_H__ +#pragma once /** \file * \ingroup bke @@ -41,5 +40,3 @@ bool BKE_editmesh_cache_calc_minmax(struct BMEditMesh *em, #ifdef __cplusplus } #endif - -#endif /* __BKE_EDITMESH_CACHE_H__ */ diff --git a/source/blender/blenkernel/BKE_editmesh_tangent.h b/source/blender/blenkernel/BKE_editmesh_tangent.h index 27f24438528..0e3f063ae44 100644 --- a/source/blender/blenkernel/BKE_editmesh_tangent.h +++ b/source/blender/blenkernel/BKE_editmesh_tangent.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_EDITMESH_TANGENT_H__ -#define __BKE_EDITMESH_TANGENT_H__ +#pragma once /** \file * \ingroup bke @@ -39,5 +38,3 @@ void BKE_editmesh_loop_tangent_calc(BMEditMesh *em, #ifdef __cplusplus } #endif - -#endif /* __BKE_EDITMESH_TANGENT_H__ */ diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h index 0518ce8ffa3..0585f67703c 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_EFFECT_H__ -#define __BKE_EFFECT_H__ +#pragma once /** \file * \ingroup bke @@ -283,5 +282,3 @@ void BKE_sim_debug_data_clear_category(const char *category); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index b846e2e5b7b..3717eb0f282 100644 --- a/source/blender/blenkernel/BKE_fcurve.h +++ b/source/blender/blenkernel/BKE_fcurve.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_FCURVE_H__ -#define __BKE_FCURVE_H__ +#pragma once /** \file * \ingroup bke @@ -315,5 +314,3 @@ void fcurve_store_samples( #ifdef __cplusplus } #endif - -#endif /* __BKE_FCURVE_H__*/ diff --git a/source/blender/blenkernel/BKE_fcurve_driver.h b/source/blender/blenkernel/BKE_fcurve_driver.h index 6803485f843..5b4da4a78a4 100644 --- a/source/blender/blenkernel/BKE_fcurve_driver.h +++ b/source/blender/blenkernel/BKE_fcurve_driver.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_FCURVE_DRIVER_H__ -#define __BKE_FCURVE_DRIVER_H__ +#pragma once /** \file * \ingroup bke @@ -103,5 +102,3 @@ float evaluate_driver(struct PathResolvedRNA *anim_rna, #ifdef __cplusplus } #endif - -#endif /* __BKE_FCURVE_DRIVER_H__*/ diff --git a/source/blender/blenkernel/BKE_fluid.h b/source/blender/blenkernel/BKE_fluid.h index 2392263181d..88a5492d85b 100644 --- a/source/blender/blenkernel/BKE_fluid.h +++ b/source/blender/blenkernel/BKE_fluid.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_FLUID_H__ -#define __BKE_FLUID_H__ +#pragma once /** \file * \ingroup bke @@ -101,5 +100,3 @@ void BKE_fluid_flow_behavior_set(struct Object *object, #ifdef __cplusplus } #endif - -#endif /* __BKE_FLUID_H__ */ diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h index 35f7d8b7d53..b23ccbe25ff 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_font.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_FONT_H__ -#define __BKE_FONT_H__ +#pragma once /** \file * \ingroup bke @@ -102,5 +101,3 @@ void BKE_vfont_clipboard_get(char32_t **r_text_buf, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_freestyle.h b/source/blender/blenkernel/BKE_freestyle.h index 888a3d96aa2..47f0b547d83 100644 --- a/source/blender/blenkernel/BKE_freestyle.h +++ b/source/blender/blenkernel/BKE_freestyle.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_FREESTYLE_H__ -#define __BKE_FREESTYLE_H__ +#pragma once /** \file * \ingroup bke @@ -66,5 +65,3 @@ void BKE_freestyle_lineset_unique_name(FreestyleConfig *config, FreestyleLineSet #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index a356ad56994..9ffd496616d 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_GLOBAL_H__ -#define __BKE_GLOBAL_H__ +#pragma once /** \file * \ingroup bke @@ -224,5 +223,3 @@ extern Global G; #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index cd434566e43..6defc2ffd68 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -17,8 +17,7 @@ * This is a new part of Blender */ -#ifndef __BKE_GPENCIL_H__ -#define __BKE_GPENCIL_H__ +#pragma once /** \file * \ingroup bke @@ -280,5 +279,3 @@ void BKE_gpencil_update_layer_parent(const struct Depsgraph *depsgraph, struct O #ifdef __cplusplus } #endif - -#endif /* __BKE_GPENCIL_H__ */ diff --git a/source/blender/blenkernel/BKE_gpencil_curve.h b/source/blender/blenkernel/BKE_gpencil_curve.h index cf6f9074bda..3fbd0ce1a51 100644 --- a/source/blender/blenkernel/BKE_gpencil_curve.h +++ b/source/blender/blenkernel/BKE_gpencil_curve.h @@ -17,8 +17,7 @@ * This is a new part of Blender */ -#ifndef __BKE_GPENCIL_CURVE_H__ -#define __BKE_GPENCIL_CURVE_H__ +#pragma once /** \file * \ingroup bke @@ -43,5 +42,3 @@ void BKE_gpencil_convert_curve(struct Main *bmain, #ifdef __cplusplus } #endif - -#endif /* __BKE_GPENCIL_CURVE_H__ */ diff --git a/source/blender/blenkernel/BKE_gpencil_geom.h b/source/blender/blenkernel/BKE_gpencil_geom.h index c97461fb0c8..0abd87d3d4e 100644 --- a/source/blender/blenkernel/BKE_gpencil_geom.h +++ b/source/blender/blenkernel/BKE_gpencil_geom.h @@ -17,8 +17,7 @@ * This is a new part of Blender */ -#ifndef __BKE_GPENCIL_GEOM_H__ -#define __BKE_GPENCIL_GEOM_H__ +#pragma once /** \file * \ingroup bke @@ -131,5 +130,3 @@ void BKE_gpencil_convert_mesh(struct Main *bmain, #ifdef __cplusplus } #endif - -#endif /* __BKE_GPENCIL_GEOM_H__ */ diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h index ac5f4607838..8eafbe04a14 100644 --- a/source/blender/blenkernel/BKE_gpencil_modifier.h +++ b/source/blender/blenkernel/BKE_gpencil_modifier.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_GPENCIL_MODIFIER_H__ -#define __BKE_GPENCIL_MODIFIER_H__ +#pragma once /** \file * \ingroup bke @@ -316,5 +315,3 @@ struct bGPDframe *BKE_gpencil_frame_retime_get(struct Depsgraph *depsgraph, #ifdef __cplusplus } #endif - -#endif /* __BKE_GPENCIL_MODIFIER_H__ */ diff --git a/source/blender/blenkernel/BKE_hair.h b/source/blender/blenkernel/BKE_hair.h index ea515416b58..bf386e099e0 100644 --- a/source/blender/blenkernel/BKE_hair.h +++ b/source/blender/blenkernel/BKE_hair.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_HAIR_H__ -#define __BKE_HAIR_H__ +#pragma once /** \file * \ingroup bke @@ -61,5 +60,3 @@ extern void (*BKE_hair_batch_cache_free_cb)(struct Hair *hair); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h index 56c50c22bf4..8a4fc78eb97 100644 --- a/source/blender/blenkernel/BKE_icons.h +++ b/source/blender/blenkernel/BKE_icons.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_ICONS_H__ -#define __BKE_ICONS_H__ +#pragma once /** \file * \ingroup bke @@ -173,5 +172,3 @@ int BKE_icon_ensure_studio_light(struct StudioLight *sl, int id_type); #ifdef __cplusplus } #endif - -#endif /* __BKE_ICONS_H__ */ diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index dc01e8ea27b..58629cde6ec 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_IDPROP_H__ -#define __BKE_IDPROP_H__ +#pragma once /** \file * \ingroup bke @@ -200,5 +199,3 @@ void IDP_print(const struct IDProperty *prop); #ifdef __cplusplus } #endif - -#endif /* __BKE_IDPROP_H__ */ diff --git a/source/blender/blenkernel/BKE_idtype.h b/source/blender/blenkernel/BKE_idtype.h index 38322427374..aefba9ef02a 100644 --- a/source/blender/blenkernel/BKE_idtype.h +++ b/source/blender/blenkernel/BKE_idtype.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_IDTYPE_H__ -#define __BKE_IDTYPE_H__ +#pragma once /** \file * \ingroup bke @@ -246,5 +245,3 @@ void BKE_idtype_id_foreach_cache(struct ID *id, #ifdef __cplusplus } #endif - -#endif /* __BKE_IDTYPE_H__ */ diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index 1e5573ab014..a18084f8bbd 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_IMAGE_H__ -#define __BKE_IMAGE_H__ +#pragma once /** \file * \ingroup bke @@ -370,5 +369,3 @@ bool BKE_image_clear_renderslot(struct Image *ima, struct ImageUser *iuser, int #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_image_save.h b/source/blender/blenkernel/BKE_image_save.h index 8dfece944ff..0620442d998 100644 --- a/source/blender/blenkernel/BKE_image_save.h +++ b/source/blender/blenkernel/BKE_image_save.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_IMAGE_SAVE_H__ -#define __BKE_IMAGE_SAVE_H__ +#pragma once #include "DNA_scene_types.h" @@ -62,5 +61,3 @@ bool BKE_image_save(struct ReportList *reports, #ifdef __cplusplus } #endif - -#endif /* __BKE_IMAGE_SAVE_H__ */ diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h index ab5d2f66441..40b9f738bfd 100644 --- a/source/blender/blenkernel/BKE_ipo.h +++ b/source/blender/blenkernel/BKE_ipo.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_IPO_H__ -#define __BKE_IPO_H__ +#pragma once /** \file * \ingroup bke @@ -37,5 +36,3 @@ void do_versions_ipos_to_animato(struct Main *main); #ifdef __cplusplus }; #endif - -#endif diff --git a/source/blender/blenkernel/BKE_kelvinlet.h b/source/blender/blenkernel/BKE_kelvinlet.h index b8290730751..b3966d3ca4a 100644 --- a/source/blender/blenkernel/BKE_kelvinlet.h +++ b/source/blender/blenkernel/BKE_kelvinlet.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) Blender Foundation. * All rights reserved. */ -#ifndef __BKE_KELVINLET_H__ -#define __BKE_KELVINLET_H__ +#pragma once /** \file * \ingroup bke @@ -81,5 +80,3 @@ void BKE_kelvinlet_twist(float r_elem_disp[3], #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h index b0eef02611b..e67df194431 100644 --- a/source/blender/blenkernel/BKE_key.h +++ b/source/blender/blenkernel/BKE_key.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_KEY_H__ -#define __BKE_KEY_H__ +#pragma once /** \file * \ingroup bke @@ -139,5 +138,3 @@ void BKE_keyblock_data_set(struct Key *key, const int shape_index, const void *d #ifdef __cplusplus }; #endif - -#endif /* __BKE_KEY_H__ */ diff --git a/source/blender/blenkernel/BKE_keyconfig.h b/source/blender/blenkernel/BKE_keyconfig.h index bc33cc2669e..ab42d5742ea 100644 --- a/source/blender/blenkernel/BKE_keyconfig.h +++ b/source/blender/blenkernel/BKE_keyconfig.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_KEYCONFIG_H__ -#define __BKE_KEYCONFIG_H__ +#pragma once /** \file * \ingroup bke @@ -76,5 +75,3 @@ void BKE_keyconfig_pref_filter_items(struct UserDef *userdef, #ifdef __cplusplus } #endif - -#endif /* __BKE_KEYCONFIG_H__ */ diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index fdcea95704f..03c57d4caac 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_LATTICE_H__ -#define __BKE_LATTICE_H__ +#pragma once /** \file * \ingroup bke @@ -140,5 +139,3 @@ void BKE_lattice_deform_coords_with_editmesh(const struct Object *ob_lattice, #ifdef __cplusplus } #endif - -#endif /* __BKE_LATTICE_H__ */ diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 7a0252e6813..7fe932edf31 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_LAYER_H__ -#define __BKE_LAYER_H__ +#pragma once /** \file * \ingroup bke @@ -416,5 +415,3 @@ bool BKE_view_layer_filter_edit_mesh_has_edges(struct Object *ob, void *user_dat #ifdef __cplusplus } #endif - -#endif /* __BKE_LAYER_H__ */ diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h index d46a03e90af..a2cbe537349 100644 --- a/source/blender/blenkernel/BKE_lib_id.h +++ b/source/blender/blenkernel/BKE_lib_id.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_LIB_ID_H__ -#define __BKE_LIB_ID_H__ +#pragma once /** \file * \ingroup bke @@ -291,5 +290,3 @@ void BKE_id_reorder(const struct ListBase *lb, struct ID *id, struct ID *relativ #ifdef __cplusplus } #endif - -#endif /* __BKE_LIB_ID_H__ */ diff --git a/source/blender/blenkernel/BKE_lib_override.h b/source/blender/blenkernel/BKE_lib_override.h index 6a05f0c22b6..5af73a1579d 100644 --- a/source/blender/blenkernel/BKE_lib_override.h +++ b/source/blender/blenkernel/BKE_lib_override.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_LIB_OVERRIDE_H__ -#define __BKE_LIB_OVERRIDE_H__ +#pragma once /** \file * \ingroup bke @@ -151,5 +150,3 @@ void BKE_lib_override_library_operations_store_finalize(OverrideLibraryStorage * #ifdef __cplusplus } #endif - -#endif /* __BKE_LIB_OVERRIDE_H__ */ diff --git a/source/blender/blenkernel/BKE_lib_query.h b/source/blender/blenkernel/BKE_lib_query.h index c5a25e8e7af..b6abe0bf18c 100644 --- a/source/blender/blenkernel/BKE_lib_query.h +++ b/source/blender/blenkernel/BKE_lib_query.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2014 by Blender Foundation. * All rights reserved. */ -#ifndef __BKE_LIB_QUERY_H__ -#define __BKE_LIB_QUERY_H__ +#pragma once /** \file * \ingroup bke @@ -182,5 +181,3 @@ void BKE_library_indirectly_used_data_tag_clear(struct Main *bmain); #ifdef __cplusplus } #endif - -#endif /* __BKE_LIB_QUERY_H__ */ diff --git a/source/blender/blenkernel/BKE_lib_remap.h b/source/blender/blenkernel/BKE_lib_remap.h index 8129b9dbafb..fb14e340d8b 100644 --- a/source/blender/blenkernel/BKE_lib_remap.h +++ b/source/blender/blenkernel/BKE_lib_remap.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_LIB_REMAP_H__ -#define __BKE_LIB_REMAP_H__ +#pragma once /** \file * \ingroup bke @@ -113,5 +112,3 @@ void BKE_library_callback_remap_editor_id_reference_set( #ifdef __cplusplus } #endif - -#endif /* __BKE_LIB_REMAP_H__ */ diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index 7883d740b0a..3981a4c14ea 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_LIBRARY_H__ -#define __BKE_LIBRARY_H__ +#pragma once /** \file * \ingroup bke @@ -39,5 +38,3 @@ void BKE_library_filepath_set(struct Main *bmain, struct Library *lib, const cha #ifdef __cplusplus } #endif - -#endif /* __BKE_LIBRARY_H__ */ diff --git a/source/blender/blenkernel/BKE_light.h b/source/blender/blenkernel/BKE_light.h index ead27ec8002..026e5d1a13b 100644 --- a/source/blender/blenkernel/BKE_light.h +++ b/source/blender/blenkernel/BKE_light.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_LIGHT_H__ -#define __BKE_LIGHT_H__ +#pragma once /** \file * \ingroup bke @@ -44,5 +43,3 @@ void BKE_light_eval(struct Depsgraph *depsgraph, struct Light *la); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_lightprobe.h b/source/blender/blenkernel/BKE_lightprobe.h index 6304f61a1f4..e66d4ef75ca 100644 --- a/source/blender/blenkernel/BKE_lightprobe.h +++ b/source/blender/blenkernel/BKE_lightprobe.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_LIGHTPROBE_H__ -#define __BKE_LIGHTPROBE_H__ +#pragma once /** \file * \ingroup bke @@ -39,5 +38,3 @@ struct LightProbe *BKE_lightprobe_copy(struct Main *bmain, const struct LightPro #ifdef __cplusplus } #endif - -#endif /* __BKE_LIGHTPROBE_H__ */ diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h index b086f244923..19238c4d090 100644 --- a/source/blender/blenkernel/BKE_linestyle.h +++ b/source/blender/blenkernel/BKE_linestyle.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_LINESTYLE_H__ -#define __BKE_LINESTYLE_H__ +#pragma once /** \file * \ingroup bke @@ -106,5 +105,3 @@ void BKE_linestyle_default_shader(const struct bContext *C, FreestyleLineStyle * #ifdef __cplusplus } #endif - -#endif /* __BKE_LINESTYLE_H__ */ diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index b7c70168a49..2187ab6b9f5 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_MAIN_H__ -#define __BKE_MAIN_H__ +#pragma once /** \file * \ingroup bke @@ -250,5 +249,3 @@ int set_listbasepointers(struct Main *main, struct ListBase *lb[MAX_LIBARRAY]); #ifdef __cplusplus } #endif - -#endif /* __BKE_MAIN_H__ */ diff --git a/source/blender/blenkernel/BKE_main_idmap.h b/source/blender/blenkernel/BKE_main_idmap.h index e392b7db60e..b89714cefa4 100644 --- a/source/blender/blenkernel/BKE_main_idmap.h +++ b/source/blender/blenkernel/BKE_main_idmap.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_MAIN_IDMAP_H__ -#define __BKE_MAIN_IDMAP_H__ +#pragma once /** \file * \ingroup bke @@ -69,5 +68,3 @@ struct ID *BKE_main_idmap_lookup_uuid(struct IDNameLib_Map *id_typemap, #ifdef __cplusplus } #endif - -#endif /* __BKE_MAIN_IDMAP_H__ */ diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index dca677343ce..ab731c5e42f 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_MASK_H__ -#define __BKE_MASK_H__ +#pragma once /** \file * \ingroup bke @@ -331,5 +330,3 @@ void BKE_maskrasterize_buffer(MaskRasterHandle *mr_handle, #ifdef __cplusplus } #endif - -#endif /* __BKE_MASK_H__ */ diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index cae79326dda..a30d7d55985 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_MATERIAL_H__ -#define __BKE_MATERIAL_H__ +#pragma once /** \file * \ingroup bke @@ -136,5 +135,3 @@ void BKE_material_eval(struct Depsgraph *depsgraph, struct Material *material); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h index 5f51f528d14..f2ad23a35f1 100644 --- a/source/blender/blenkernel/BKE_mball.h +++ b/source/blender/blenkernel/BKE_mball.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_MBALL_H__ -#define __BKE_MBALL_H__ +#pragma once /** \file * \ingroup bke @@ -92,5 +91,3 @@ extern void (*BKE_mball_batch_cache_free_cb)(struct MetaBall *mb); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_mball_tessellate.h b/source/blender/blenkernel/BKE_mball_tessellate.h index 4e0649cf930..0ffbcf5bb05 100644 --- a/source/blender/blenkernel/BKE_mball_tessellate.h +++ b/source/blender/blenkernel/BKE_mball_tessellate.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_MBALL_TESSELLATE_H__ -#define __BKE_MBALL_TESSELLATE_H__ +#pragma once /** \file * \ingroup bke @@ -38,5 +37,3 @@ void BKE_mball_cubeTable_free(void); #ifdef __cplusplus } #endif - -#endif /* __BKE_MBALL_TESSELLATE_H__ */ diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index e0bedd20617..045563f8e52 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_MESH_H__ -#define __BKE_MESH_H__ +#pragma once /** \file * \ingroup bke @@ -707,5 +706,3 @@ BLI_INLINE int BKE_mesh_origindex_mface_mpoly(const int *index_mf_to_mpoly, #ifdef __cplusplus } #endif - -#endif /* __BKE_MESH_H__ */ diff --git a/source/blender/blenkernel/BKE_mesh_iterators.h b/source/blender/blenkernel/BKE_mesh_iterators.h index f7eaa7f69b8..103e7b5b78f 100644 --- a/source/blender/blenkernel/BKE_mesh_iterators.h +++ b/source/blender/blenkernel/BKE_mesh_iterators.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_MESH_ITERATORS_H__ -#define __BKE_MESH_ITERATORS_H__ +#pragma once /** \file * \ingroup bke @@ -70,5 +69,3 @@ void BKE_mesh_foreach_mapped_vert_coords_get(struct Mesh *me_eval, #ifdef __cplusplus } #endif - -#endif /* __BKE_MESH_ITERATORS_H__ */ diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h index 5ad5238bbb5..140a60dbdb7 100644 --- a/source/blender/blenkernel/BKE_mesh_mapping.h +++ b/source/blender/blenkernel/BKE_mesh_mapping.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_MESH_MAPPING_H__ -#define __BKE_MESH_MAPPING_H__ +#pragma once /** \file * \ingroup bke @@ -258,5 +257,3 @@ int *BKE_mesh_calc_smoothgroups(const struct MEdge *medge, #ifdef __cplusplus } #endif - -#endif /* __BKE_MESH_MAPPING_H__ */ diff --git a/source/blender/blenkernel/BKE_mesh_mirror.h b/source/blender/blenkernel/BKE_mesh_mirror.h index 0a68d028e35..2c6920a18bf 100644 --- a/source/blender/blenkernel/BKE_mesh_mirror.h +++ b/source/blender/blenkernel/BKE_mesh_mirror.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_MESH_MIRROR_H__ -#define __BKE_MESH_MIRROR_H__ +#pragma once /** \file * \ingroup bke @@ -49,5 +48,3 @@ struct Mesh *BKE_mesh_mirror_apply_mirror_on_axis(struct MirrorModifierData *mmd #ifdef __cplusplus } #endif - -#endif /* __BKE_MESH_MIRROR_H__ */ diff --git a/source/blender/blenkernel/BKE_mesh_remap.h b/source/blender/blenkernel/BKE_mesh_remap.h index fff89e50744..d9b6ab3813e 100644 --- a/source/blender/blenkernel/BKE_mesh_remap.h +++ b/source/blender/blenkernel/BKE_mesh_remap.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_MESH_REMAP_H__ -#define __BKE_MESH_REMAP_H__ +#pragma once /** \file * \ingroup bke @@ -234,5 +233,3 @@ void BKE_mesh_remap_calc_polys_from_mesh(const int mode, #ifdef __cplusplus } #endif - -#endif /* __BKE_MESH_REMAP_H__ */ diff --git a/source/blender/blenkernel/BKE_mesh_remesh_voxel.h b/source/blender/blenkernel/BKE_mesh_remesh_voxel.h index 24f95f7ed20..2265fa6e105 100644 --- a/source/blender/blenkernel/BKE_mesh_remesh_voxel.h +++ b/source/blender/blenkernel/BKE_mesh_remesh_voxel.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_MESH_REMESH_VOXEL_H__ -#define __BKE_MESH_REMESH_VOXEL_H__ +#pragma once /** \file * \ingroup bke @@ -66,5 +65,3 @@ void BKE_remesh_reproject_sculpt_face_sets(struct Mesh *target, struct Mesh *sou #ifdef __cplusplus } #endif - -#endif /* __BKE_MESH_REMESH_VOXEL_H__ */ diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.h index 468ec6a44cd..adb7c357049 100644 --- a/source/blender/blenkernel/BKE_mesh_runtime.h +++ b/source/blender/blenkernel/BKE_mesh_runtime.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_MESH_RUNTIME_H__ -#define __BKE_MESH_RUNTIME_H__ +#pragma once /** \file * \ingroup bke @@ -111,5 +110,3 @@ bool BKE_mesh_runtime_is_valid(struct Mesh *me_eval); #ifdef __cplusplus } #endif - -#endif /* __BKE_MESH_RUNTIME_H__ */ diff --git a/source/blender/blenkernel/BKE_mesh_tangent.h b/source/blender/blenkernel/BKE_mesh_tangent.h index 7b686f112aa..96eaa23ce71 100644 --- a/source/blender/blenkernel/BKE_mesh_tangent.h +++ b/source/blender/blenkernel/BKE_mesh_tangent.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_MESH_TANGENT_H__ -#define __BKE_MESH_TANGENT_H__ +#pragma once /** \file * \ingroup bke @@ -87,5 +86,3 @@ void BKE_mesh_calc_loop_tangent_step_0(const struct CustomData *loopData, #ifdef __cplusplus } #endif - -#endif /* __BKE_MESH_TANGENT_H__ */ diff --git a/source/blender/blenkernel/BKE_mesh_wrapper.h b/source/blender/blenkernel/BKE_mesh_wrapper.h index 00e2dd08726..2fe264fd0f7 100644 --- a/source/blender/blenkernel/BKE_mesh_wrapper.h +++ b/source/blender/blenkernel/BKE_mesh_wrapper.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_MESH_WRAPPER_H__ -#define __BKE_MESH_WRAPPER_H__ +#pragma once /** \file * \ingroup bke @@ -55,5 +54,3 @@ void BKE_mesh_wrapper_vert_coords_copy_with_mat4(const struct Mesh *me, #ifdef __cplusplus } #endif - -#endif /* __BKE_MESH_WRAPPER_H__ */ diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index e16a9284425..f9590696c2e 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_MODIFIER_H__ -#define __BKE_MODIFIER_H__ +#pragma once /** \file * \ingroup bke @@ -543,5 +542,3 @@ struct Mesh *BKE_modifier_get_evaluated_mesh_from_evaluated_object(struct Object #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h index dbd6eb15bf2..d1f6efc035b 100644 --- a/source/blender/blenkernel/BKE_movieclip.h +++ b/source/blender/blenkernel/BKE_movieclip.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_MOVIECLIP_H__ -#define __BKE_MOVIECLIP_H__ +#pragma once /** \file * \ingroup bke @@ -132,5 +131,3 @@ void BKE_movieclip_eval_selection_update(struct Depsgraph *depsgraph, struct Mov #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index 15ba72ef5b5..db2dc7ec87f 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_MULTIRES_H__ -#define __BKE_MULTIRES_H__ +#pragma once /** \file * \ingroup bke @@ -235,5 +234,3 @@ BLI_INLINE void BKE_multires_construct_tangent_matrix(float tangent_matrix[3][3] #endif #include "intern/multires_inline.h" - -#endif /* __BKE_MULTIRES_H__ */ diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h index 2be8d657bf4..8b3231e5302 100644 --- a/source/blender/blenkernel/BKE_nla.h +++ b/source/blender/blenkernel/BKE_nla.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_NLA_H__ -#define __BKE_NLA_H__ +#pragma once /** \file * \ingroup bke @@ -149,5 +148,3 @@ float BKE_nla_tweakedit_remap(struct AnimData *adt, float cframe, short mode); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 4c55488ecd5..b9e2531755b 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_NODE_H__ -#define __BKE_NODE_H__ +#pragma once /** \file * \ingroup bke @@ -1365,5 +1364,3 @@ extern struct bNodeSocketType NodeSocketTypeUndefined; #ifdef __cplusplus } #endif - -#endif /* __BKE_NODE_H__ */ diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 7f2bdccf3a4..215f4043e34 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_OBJECT_H__ -#define __BKE_OBJECT_H__ +#pragma once /** \file * \ingroup bke @@ -413,5 +412,3 @@ void BKE_object_to_mesh_clear(struct Object *object); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_object_deform.h b/source/blender/blenkernel/BKE_object_deform.h index e4813aa2288..a10158254c2 100644 --- a/source/blender/blenkernel/BKE_object_deform.h +++ b/source/blender/blenkernel/BKE_object_deform.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_OBJECT_DEFORM_H__ -#define __BKE_OBJECT_DEFORM_H__ +#pragma once /** \file * \ingroup bke @@ -95,5 +94,3 @@ void BKE_object_defgroup_mirror_selection(struct Object *ob, #ifdef __cplusplus } #endif - -#endif /* __BKE_OBJECT_DEFORM_H__ */ diff --git a/source/blender/blenkernel/BKE_object_facemap.h b/source/blender/blenkernel/BKE_object_facemap.h index 83780d8fad5..10cb4a54bde 100644 --- a/source/blender/blenkernel/BKE_object_facemap.h +++ b/source/blender/blenkernel/BKE_object_facemap.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_OBJECT_FACEMAP_H__ -#define __BKE_OBJECT_FACEMAP_H__ +#pragma once /** \file * \ingroup bke @@ -48,5 +47,3 @@ void BKE_object_facemap_index_map_apply(int *fmap, int fmap_len, const int *map, #ifdef __cplusplus } #endif - -#endif /* __BKE_OBJECT_FACEMAP_H__ */ diff --git a/source/blender/blenkernel/BKE_ocean.h b/source/blender/blenkernel/BKE_ocean.h index 6ce2e13cf18..6d488cc3142 100644 --- a/source/blender/blenkernel/BKE_ocean.h +++ b/source/blender/blenkernel/BKE_ocean.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_OCEAN_H__ -#define __BKE_OCEAN_H__ +#pragma once #include <stdbool.h> @@ -135,5 +134,3 @@ float BLI_ocean_spectrum_jonswap(const struct Ocean *oc, const float kx, const f #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_outliner_treehash.h b/source/blender/blenkernel/BKE_outliner_treehash.h index 9f4ebffdcf4..94bf0f622d6 100644 --- a/source/blender/blenkernel/BKE_outliner_treehash.h +++ b/source/blender/blenkernel/BKE_outliner_treehash.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_OUTLINER_TREEHASH_H__ -#define __BKE_OUTLINER_TREEHASH_H__ +#pragma once /** \file * \ingroup bke @@ -59,5 +58,3 @@ void BKE_outliner_treehash_free(void *treehash); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h index fb2578b81b0..1e8721045cd 100644 --- a/source/blender/blenkernel/BKE_packedFile.h +++ b/source/blender/blenkernel/BKE_packedFile.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_PACKEDFILE_H__ -#define __BKE_PACKEDFILE_H__ +#pragma once /** \file * \ingroup bke @@ -125,5 +124,3 @@ void BKE_packedfile_id_unpack(struct Main *bmain, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index de18ec6b792..e2381bf68ac 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_PAINT_H__ -#define __BKE_PAINT_H__ +#pragma once /** \file * \ingroup bke @@ -485,5 +484,3 @@ enum { #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 91d9b710823..1e7a4ae75fb 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -20,8 +20,7 @@ * Copyright 2011-2012 AutoCRC */ -#ifndef __BKE_PARTICLE_H__ -#define __BKE_PARTICLE_H__ +#pragma once /** \file * \ingroup bke @@ -631,5 +630,3 @@ extern void (*BKE_particle_batch_cache_free_cb)(struct ParticleSystem *psys); #ifdef __cplusplus } #endif - -#endif /* __BKE_PARTICLE_H__ */ diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index da9280148fd..9826dfaa4a5 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_PBVH_H__ -#define __BKE_PBVH_H__ +#pragma once /** \file * \ingroup bke @@ -489,5 +488,3 @@ void BKE_pbvh_node_color_buffer_free(PBVH *pbvh); #ifdef __cplusplus } #endif - -#endif /* __BKE_PBVH_H__ */ diff --git a/source/blender/blenkernel/BKE_persistent_data_handle.hh b/source/blender/blenkernel/BKE_persistent_data_handle.hh index 721132560e3..c8e02062f0b 100644 --- a/source/blender/blenkernel/BKE_persistent_data_handle.hh +++ b/source/blender/blenkernel/BKE_persistent_data_handle.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_PERSISTENT_DATA_HANDLE_H__ -#define __BKE_PERSISTENT_DATA_HANDLE_H__ +#pragma once /** \file * \ingroup bke @@ -128,5 +127,3 @@ class PersistentDataHandleMap { }; } // namespace blender::bke - -#endif /* __BKE_PERSISTENT_DATA_HANDLE_H__ */ diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index dc99ec7f56f..c5bf94cc0c8 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_POINTCACHE_H__ -#define __BKE_POINTCACHE_H__ +#pragma once /** \file * \ingroup bke @@ -387,5 +386,3 @@ void BKE_ptcache_invalidate(struct PointCache *cache); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_pointcloud.h b/source/blender/blenkernel/BKE_pointcloud.h index d641d3feb62..b2e7e1d23ee 100644 --- a/source/blender/blenkernel/BKE_pointcloud.h +++ b/source/blender/blenkernel/BKE_pointcloud.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_POINTCLOUD_H__ -#define __BKE_POINTCLOUD_H__ +#pragma once /** \file * \ingroup bke @@ -64,5 +63,3 @@ extern void (*BKE_pointcloud_batch_cache_free_cb)(struct PointCloud *pointcloud) #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_report.h b/source/blender/blenkernel/BKE_report.h index 063c0831a0d..5b22918e84c 100644 --- a/source/blender/blenkernel/BKE_report.h +++ b/source/blender/blenkernel/BKE_report.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_REPORT_H__ -#define __BKE_REPORT_H__ +#pragma once /** \file * \ingroup bke @@ -69,5 +68,3 @@ bool BKE_report_write_file(const char *filepath, ReportList *reports, const char #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_rigidbody.h b/source/blender/blenkernel/BKE_rigidbody.h index b4aa0ac2b93..c2059144388 100644 --- a/source/blender/blenkernel/BKE_rigidbody.h +++ b/source/blender/blenkernel/BKE_rigidbody.h @@ -22,8 +22,7 @@ * \brief API for Blender-side Rigid Body stuff */ -#ifndef __BKE_RIGIDBODY_H__ -#define __BKE_RIGIDBODY_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -162,5 +161,3 @@ void BKE_rigidbody_object_sync_transforms(struct Depsgraph *depsgraph, #ifdef __cplusplus } #endif - -#endif /* __BKE_RIGIDBODY_H__ */ diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 800370318c4..8cd86593873 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_SCENE_H__ -#define __BKE_SCENE_H__ +#pragma once /** \file * \ingroup bke @@ -260,5 +259,3 @@ void BKE_scene_eval_sequencer_sequences(struct Depsgraph *depsgraph, struct Scen #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index 13716ddb5c6..735d6dc6e89 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_SCREEN_H__ -#define __BKE_SCREEN_H__ +#pragma once /** \file * \ingroup bke @@ -436,5 +435,3 @@ void BKE_screen_header_alignment_reset(struct bScreen *screen); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 60a0bee801d..03f14be8772 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_SEQUENCER_H__ -#define __BKE_SEQUENCER_H__ +#pragma once /** \file * \ingroup bke @@ -636,5 +635,3 @@ void BKE_sequencer_check_uuids_unique_and_report(const struct Scene *scene); #ifdef __cplusplus } #endif - -#endif /* __BKE_SEQUENCER_H__ */ diff --git a/source/blender/blenkernel/BKE_sequencer_offscreen.h b/source/blender/blenkernel/BKE_sequencer_offscreen.h index cc822e97270..90d3f80320a 100644 --- a/source/blender/blenkernel/BKE_sequencer_offscreen.h +++ b/source/blender/blenkernel/BKE_sequencer_offscreen.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_SEQUENCER_OFFSCREEN_H__ -#define __BKE_SEQUENCER_OFFSCREEN_H__ +#pragma once /** \file * \ingroup bke @@ -52,5 +51,3 @@ extern SequencerDrawView sequencer_view3d_fn; #ifdef __cplusplus } #endif - -#endif /* __BKE_SEQUENCER_H__ */ diff --git a/source/blender/blenkernel/BKE_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h index 31e14c6c884..1eb52b389d1 100644 --- a/source/blender/blenkernel/BKE_shader_fx.h +++ b/source/blender/blenkernel/BKE_shader_fx.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_SHADER_FX_H__ -#define __BKE_SHADER_FX_H__ +#pragma once /** \file * \ingroup bke @@ -189,5 +188,3 @@ bool BKE_shaderfx_has_gpencil(struct Object *ob); #ifdef __cplusplus } #endif - -#endif /* __BKE_SHADER_FX_H__ */ diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h index 83129bed5f7..bcf702ea797 100644 --- a/source/blender/blenkernel/BKE_shrinkwrap.h +++ b/source/blender/blenkernel/BKE_shrinkwrap.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) Blender Foundation. * All rights reserved. */ -#ifndef __BKE_SHRINKWRAP_H__ -#define __BKE_SHRINKWRAP_H__ +#pragma once /** \file * \ingroup bke @@ -192,5 +191,3 @@ void BKE_shrinkwrap_snap_point_to_surface(const struct ShrinkwrapTreeData *tree, #ifdef __cplusplus } #endif - -#endif /* __BKE_SHRINKWRAP_H__ */ diff --git a/source/blender/blenkernel/BKE_simulation.h b/source/blender/blenkernel/BKE_simulation.h index 5aa71b6381d..98d1cf1e9b5 100644 --- a/source/blender/blenkernel/BKE_simulation.h +++ b/source/blender/blenkernel/BKE_simulation.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_SIMULATION_H__ -#define __BKE_SIMULATION_H__ +#pragma once #include "DNA_simulation_types.h" @@ -55,5 +54,3 @@ void BKE_simulation_state_copy_data(const SimulationState *src_state, Simulation template<typename StateType> const char *BKE_simulation_get_state_type_name(); #endif - -#endif /* __BKE_SIMULATION_H__ */ diff --git a/source/blender/blenkernel/BKE_softbody.h b/source/blender/blenkernel/BKE_softbody.h index e4012094b74..28d299679ed 100644 --- a/source/blender/blenkernel/BKE_softbody.h +++ b/source/blender/blenkernel/BKE_softbody.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) Blender Foundation. * All rights reserved. */ -#ifndef __BKE_SOFTBODY_H__ -#define __BKE_SOFTBODY_H__ +#pragma once /** \file * \ingroup bke @@ -76,5 +75,3 @@ extern void SB_estimate_transform(Object *ob, float lloc[3], float lrot[3][3], f #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index b93591b7b60..57ce33a239f 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_SOUND_H__ -#define __BKE_SOUND_H__ +#pragma once /** \file * \ingroup bke @@ -194,5 +193,3 @@ void BKE_sound_evaluate(struct Depsgraph *depsgraph, struct Main *bmain, struct #ifdef __cplusplus } #endif - -#endif /* __BKE_SOUND_H__ */ diff --git a/source/blender/blenkernel/BKE_speaker.h b/source/blender/blenkernel/BKE_speaker.h index 54bb7274e4b..b01824dd794 100644 --- a/source/blender/blenkernel/BKE_speaker.h +++ b/source/blender/blenkernel/BKE_speaker.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_SPEAKER_H__ -#define __BKE_SPEAKER_H__ +#pragma once /** \file * \ingroup bke @@ -35,5 +34,3 @@ struct Speaker *BKE_speaker_copy(struct Main *bmain, const struct Speaker *spk); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_studiolight.h b/source/blender/blenkernel/BKE_studiolight.h index ff11f581cc4..32c571e5f91 100644 --- a/source/blender/blenkernel/BKE_studiolight.h +++ b/source/blender/blenkernel/BKE_studiolight.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_STUDIOLIGHT_H__ -#define __BKE_STUDIOLIGHT_H__ +#pragma once /** \file * \ingroup bke @@ -168,5 +167,3 @@ void BKE_studiolight_unset_icon_id(StudioLight *sl, int icon_id); #ifdef __cplusplus } #endif - -#endif /* __BKE_STUDIOLIGHT_H__ */ diff --git a/source/blender/blenkernel/BKE_subdiv.h b/source/blender/blenkernel/BKE_subdiv.h index 1323938e479..96a79d753cf 100644 --- a/source/blender/blenkernel/BKE_subdiv.h +++ b/source/blender/blenkernel/BKE_subdiv.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_SUBDIV_H__ -#define __BKE_SUBDIV_H__ +#pragma once #include "BLI_compiler_compat.h" #include "BLI_sys_types.h" @@ -302,5 +301,3 @@ BLI_INLINE float BKE_subdiv_edge_crease_to_sharpness_char(char edge_crease); #endif #include "intern/subdiv_inline.h" - -#endif /* __BKE_SUBDIV_H__ */ diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.h index 02b83a043b4..2277eb27ef1 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/source/blender/blenkernel/BKE_subdiv_ccg.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_SUBDIV_CCG_H__ -#define __BKE_SUBDIV_CCG_H__ +#pragma once #include "BKE_DerivedMesh.h" #include "BKE_customdata.h" @@ -343,5 +342,3 @@ void BKE_subdiv_ccg_grid_hidden_ensure(SubdivCCG *subdiv_ccg, int grid_index); #ifdef __cplusplus } #endif - -#endif /* __BKE_SUBDIV_CCG_H__ */ diff --git a/source/blender/blenkernel/BKE_subdiv_deform.h b/source/blender/blenkernel/BKE_subdiv_deform.h index 735cd20a6c8..1cdb8d2c794 100644 --- a/source/blender/blenkernel/BKE_subdiv_deform.h +++ b/source/blender/blenkernel/BKE_subdiv_deform.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_SUBDIV_DEFORM_H__ -#define __BKE_SUBDIV_DEFORM_H__ +#pragma once #include "BLI_sys_types.h" @@ -48,5 +47,3 @@ void BKE_subdiv_deform_coarse_vertices(struct Subdiv *subdiv, #ifdef __cplusplus } #endif - -#endif /* __BKE_SUBDIV_DEFORM_H__ */ diff --git a/source/blender/blenkernel/BKE_subdiv_eval.h b/source/blender/blenkernel/BKE_subdiv_eval.h index aa27df88be8..204e802da6e 100644 --- a/source/blender/blenkernel/BKE_subdiv_eval.h +++ b/source/blender/blenkernel/BKE_subdiv_eval.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_SUBDIV_EVAL_H__ -#define __BKE_SUBDIV_EVAL_H__ +#pragma once #include "BLI_sys_types.h" @@ -149,5 +148,3 @@ void BKE_subdiv_eval_limit_patch_resolution_point_and_short_normal(struct Subdiv #ifdef __cplusplus } #endif - -#endif /* __BKE_SUBDIV_EVAL_H__ */ diff --git a/source/blender/blenkernel/BKE_subdiv_foreach.h b/source/blender/blenkernel/BKE_subdiv_foreach.h index bef141b5ac5..a351b9a3d11 100644 --- a/source/blender/blenkernel/BKE_subdiv_foreach.h +++ b/source/blender/blenkernel/BKE_subdiv_foreach.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_SUBDIV_FOREACH_H__ -#define __BKE_SUBDIV_FOREACH_H__ +#pragma once #include "BLI_sys_types.h" @@ -178,5 +177,3 @@ bool BKE_subdiv_foreach_subdiv_geometry(struct Subdiv *subdiv, #ifdef __cplusplus } #endif - -#endif /* __BKE_SUBDIV_FOREACH_H__ */ diff --git a/source/blender/blenkernel/BKE_subdiv_mesh.h b/source/blender/blenkernel/BKE_subdiv_mesh.h index 9928c41a92b..73a3e8ed02e 100644 --- a/source/blender/blenkernel/BKE_subdiv_mesh.h +++ b/source/blender/blenkernel/BKE_subdiv_mesh.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_SUBDIV_MESH_H__ -#define __BKE_SUBDIV_MESH_H__ +#pragma once #include "BLI_sys_types.h" @@ -53,5 +52,3 @@ struct Mesh *BKE_subdiv_to_mesh(struct Subdiv *subdiv, #ifdef __cplusplus } #endif - -#endif /* __BKE_SUBDIV)MESH_H__ */ diff --git a/source/blender/blenkernel/BKE_subdiv_topology.h b/source/blender/blenkernel/BKE_subdiv_topology.h index cc32b4c03b3..42bd9392aa4 100644 --- a/source/blender/blenkernel/BKE_subdiv_topology.h +++ b/source/blender/blenkernel/BKE_subdiv_topology.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_SUBDIV_TOPOLOGY_H__ -#define __BKE_SUBDIV_TOPOLOGY_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -35,5 +34,3 @@ int BKE_subdiv_topology_num_fvar_layers_get(const struct Subdiv *subdiv); #ifdef __cplusplus } #endif - -#endif /* __BKE_SUBDIV_TOPOLOGY_H__ */ diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index 0ed58180ffa..07bbeafb1ae 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_SUBSURF_H__ -#define __BKE_SUBSURF_H__ +#pragma once /** \file * \ingroup bke @@ -158,5 +157,3 @@ typedef struct CCGDerivedMesh { #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h index 51d589e61c3..289ad351429 100644 --- a/source/blender/blenkernel/BKE_text.h +++ b/source/blender/blenkernel/BKE_text.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_TEXT_H__ -#define __BKE_TEXT_H__ +#pragma once /** \file * \ingroup bke @@ -118,5 +117,3 @@ void txt_from_buf_for_undo(struct Text *text, const char *buf, int buf_len); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_text_suggestions.h b/source/blender/blenkernel/BKE_text_suggestions.h index d618fcd6d11..f54e45b6c2f 100644 --- a/source/blender/blenkernel/BKE_text_suggestions.h +++ b/source/blender/blenkernel/BKE_text_suggestions.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2008, Blender Foundation * All rights reserved. */ -#ifndef __BKE_TEXT_SUGGESTIONS_H__ -#define __BKE_TEXT_SUGGESTIONS_H__ +#pragma once /** \file * \ingroup bke @@ -85,5 +84,3 @@ void texttool_docs_clear(void); #ifdef __cplusplus } #endif - -#endif /* __BKE_TEXT_SUGGESTIONS_H__ */ diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index 43ef2b1ba7f..c4c2498c2b1 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_TEXTURE_H__ -#define __BKE_TEXTURE_H__ +#pragma once /** \file * \ingroup bke @@ -102,5 +101,3 @@ void BKE_texture_fetch_images_for_pool(struct Tex *texture, struct ImagePool *po #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h index bb88fbf863b..2d763132923 100644 --- a/source/blender/blenkernel/BKE_tracking.h +++ b/source/blender/blenkernel/BKE_tracking.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_TRACKING_H__ -#define __BKE_TRACKING_H__ +#pragma once /** \file * \ingroup bke @@ -493,5 +492,3 @@ void BKE_tracking_get_rna_path_prefix_for_plane_track( #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_undo_system.h b/source/blender/blenkernel/BKE_undo_system.h index b32c3e315ff..4f933ca7a87 100644 --- a/source/blender/blenkernel/BKE_undo_system.h +++ b/source/blender/blenkernel/BKE_undo_system.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_UNDO_SYSTEM_H__ -#define __BKE_UNDO_SYSTEM_H__ +#pragma once /** \file * \ingroup bke @@ -212,5 +211,3 @@ void BKE_undosys_print(UndoStack *ustack); #ifdef __cplusplus } #endif - -#endif /* __BKE_UNDO_SYSTEM_H__ */ diff --git a/source/blender/blenkernel/BKE_unit.h b/source/blender/blenkernel/BKE_unit.h index 4f9ff61c9a6..a797c5555ff 100644 --- a/source/blender/blenkernel/BKE_unit.h +++ b/source/blender/blenkernel/BKE_unit.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_UNIT_H__ -#define __BKE_UNIT_H__ +#pragma once /** \file * \ingroup bke @@ -93,5 +92,3 @@ enum { #ifdef __cplusplus } #endif - -#endif /* __BKE_UNIT_H__ */ diff --git a/source/blender/blenkernel/BKE_volume.h b/source/blender/blenkernel/BKE_volume.h index 224f3ede45d..b3437454f31 100644 --- a/source/blender/blenkernel/BKE_volume.h +++ b/source/blender/blenkernel/BKE_volume.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_VOLUME_H__ -#define __BKE_VOLUME_H__ +#pragma once /** \file * \ingroup bke @@ -159,5 +158,3 @@ openvdb::GridBase::Ptr BKE_volume_grid_openvdb_for_write(const struct Volume *vo struct VolumeGrid *grid, const bool clear); #endif - -#endif diff --git a/source/blender/blenkernel/BKE_volume_render.h b/source/blender/blenkernel/BKE_volume_render.h index 5c3cd0102cf..a42f24a5312 100644 --- a/source/blender/blenkernel/BKE_volume_render.h +++ b/source/blender/blenkernel/BKE_volume_render.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_VOLUME_RENDER_H__ -#define __BKE_VOLUME_RENDER_H__ +#pragma once /** \file * \ingroup bke @@ -66,5 +65,3 @@ float BKE_volume_density_scale(const struct Volume *volume, const float matrix[4 #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_workspace.h b/source/blender/blenkernel/BKE_workspace.h index 8a6afd8a753..5ff1ba2c6f5 100644 --- a/source/blender/blenkernel/BKE_workspace.h +++ b/source/blender/blenkernel/BKE_workspace.h @@ -18,8 +18,7 @@ * \ingroup bke */ -#ifndef __BKE_WORKSPACE_H__ -#define __BKE_WORKSPACE_H__ +#pragma once #include "BLI_compiler_attrs.h" @@ -112,5 +111,3 @@ void BKE_workspace_id_tag_all_visible(struct Main *bmain, int tag) ATTR_NONNULL( #ifdef __cplusplus } #endif - -#endif /* __BKE_WORKSPACE_H__ */ diff --git a/source/blender/blenkernel/BKE_world.h b/source/blender/blenkernel/BKE_world.h index 3c8f8547b46..82830facccc 100644 --- a/source/blender/blenkernel/BKE_world.h +++ b/source/blender/blenkernel/BKE_world.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BKE_WORLD_H__ -#define __BKE_WORLD_H__ +#pragma once /** \file * \ingroup bke @@ -39,5 +38,3 @@ void BKE_world_eval(struct Depsgraph *depsgraph, struct World *world); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_writeavi.h b/source/blender/blenkernel/BKE_writeavi.h index 79605e99306..97f998cc1c1 100644 --- a/source/blender/blenkernel/BKE_writeavi.h +++ b/source/blender/blenkernel/BKE_writeavi.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_WRITEAVI_H__ -#define __BKE_WRITEAVI_H__ +#pragma once /** \file * \ingroup bke @@ -73,5 +72,3 @@ void BKE_movie_filepath_get(char *string, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h index 467e6ab7242..4c966c55e41 100644 --- a/source/blender/blenkernel/BKE_writeffmpeg.h +++ b/source/blender/blenkernel/BKE_writeffmpeg.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BKE_WRITEFFMPEG_H__ -#define __BKE_WRITEFFMPEG_H__ +#pragma once /** \file * \ingroup bke @@ -100,5 +99,3 @@ void BKE_ffmpeg_context_free(void *context_v); # endif #endif - -#endif diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index 2e5100db6de..e1805a9c512 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.h +++ b/source/blender/blenkernel/intern/CCGSubSurf.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __CCGSUBSURF_H__ -#define __CCGSUBSURF_H__ +#pragma once /** \file * \ingroup bke @@ -210,5 +209,3 @@ void ccgEdgeIterator_next(CCGEdgeIterator *ei); CCGFace *ccgFaceIterator_getCurrent(CCGFaceIterator *fi); int ccgFaceIterator_isStopped(CCGFaceIterator *fi); void ccgFaceIterator_next(CCGFaceIterator *fi); - -#endif /* __CCGSUBSURF_H__ */ diff --git a/source/blender/blenkernel/intern/CCGSubSurf_inline.h b/source/blender/blenkernel/intern/CCGSubSurf_inline.h index 86012bd2a43..8aa1fede57d 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_inline.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_inline.h @@ -18,8 +18,7 @@ * \ingroup bke */ -#ifndef __CCGSUBSURF_INLINE_H__ -#define __CCGSUBSURF_INLINE_H__ +#pragma once BLI_INLINE int ccg_gridsize(int level) { @@ -274,5 +273,3 @@ BLI_INLINE void VertDataAvg4(float v[], v[i] = (a[i] + b[i] + c[i] + d[i]) * 0.25f; } } - -#endif /* __CCGSUBSURF_INLINE_H__ */ diff --git a/source/blender/blenkernel/intern/CCGSubSurf_intern.h b/source/blender/blenkernel/intern/CCGSubSurf_intern.h index 7c35d2ccfce..82ca22e193a 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h @@ -18,8 +18,7 @@ * \ingroup bke */ -#ifndef __CCGSUBSURF_INTERN_H__ -#define __CCGSUBSURF_INTERN_H__ +#pragma once /** * Definitions which defines internal behavior of CCGSubSurf. @@ -286,5 +285,3 @@ void ccgSubSurf__dumpCoords(CCGSubSurf *ss); #endif #include "CCGSubSurf_inline.h" - -#endif /* __CCGSUBSURF_INTERN_H__ */ diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h b/source/blender/blenkernel/intern/data_transfer_intern.h index 68ded6e2bc4..c5d7dd42cb8 100644 --- a/source/blender/blenkernel/intern/data_transfer_intern.h +++ b/source/blender/blenkernel/intern/data_transfer_intern.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __DATA_TRANSFER_INTERN_H__ -#define __DATA_TRANSFER_INTERN_H__ +#pragma once #include "BKE_customdata.h" /* For cd_datatransfer_interp */ @@ -75,5 +74,3 @@ void customdata_data_transfer_interp_normal_normals(const CustomDataTransferLaye const float *weights, const int count, const float mix_factor); - -#endif /* __DATA_TRANSFER_INTERN_H__ */ diff --git a/source/blender/blenkernel/intern/lib_intern.h b/source/blender/blenkernel/intern/lib_intern.h index 9cc5db64d17..7305785573b 100644 --- a/source/blender/blenkernel/intern/lib_intern.h +++ b/source/blender/blenkernel/intern/lib_intern.h @@ -21,11 +21,8 @@ * \ingroup bke */ -#ifndef __LIB_INTERN_H__ -#define __LIB_INTERN_H__ +#pragma once extern BKE_library_free_notifier_reference_cb free_notifier_reference_cb; extern BKE_library_remap_editor_id_reference_cb remap_editor_id_reference_cb; - -#endif /* __LIB_INTERN_H__ */ diff --git a/source/blender/blenkernel/intern/multires_inline.h b/source/blender/blenkernel/intern/multires_inline.h index 3d00101ec29..49329698b3a 100644 --- a/source/blender/blenkernel/intern/multires_inline.h +++ b/source/blender/blenkernel/intern/multires_inline.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __MULTIRES_INLINE_H__ -#define __MULTIRES_INLINE_H__ +#pragma once #include "BKE_multires.h" #include "BLI_math_vector.h" @@ -57,5 +56,3 @@ BLI_INLINE void BKE_multires_construct_tangent_matrix(float tangent_matrix[3][3] normalize_v3(tangent_matrix[1]); normalize_v3(tangent_matrix[2]); } - -#endif /* __MULTIRES_INLINE_H__ */ diff --git a/source/blender/blenkernel/intern/multires_reshape.h b/source/blender/blenkernel/intern/multires_reshape.h index 12816a455ee..d6c1d79dfd7 100644 --- a/source/blender/blenkernel/intern/multires_reshape.h +++ b/source/blender/blenkernel/intern/multires_reshape.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_INTERN_MULTIRES_RESHAPE_H__ -#define __BKE_INTERN_MULTIRES_RESHAPE_H__ +#pragma once #include "BLI_sys_types.h" @@ -331,4 +330,3 @@ void multires_reshape_apply_base_refine_from_base(MultiresReshapeContext *reshap * * NOTE: Will re-evaluate all leading modifiers, so it's not cheap. */ void multires_reshape_apply_base_refine_from_deform(MultiresReshapeContext *reshape_context); -#endif /* __BKE_INTERN_MULTIRES_RESHAPE_H__ */ diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.h b/source/blender/blenkernel/intern/multires_unsubdivide.h index e00a1ae6d8b..39c6da0b6c8 100644 --- a/source/blender/blenkernel/intern/multires_unsubdivide.h +++ b/source/blender/blenkernel/intern/multires_unsubdivide.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __BKE_INTERN_MULTIRES_UNSUBDIVIDE_H__ -#define __BKE_INTERN_MULTIRES_UNSUBDIVIDE_H__ +#pragma once #include "BLI_sys_types.h" @@ -90,5 +89,3 @@ void multires_unsubdivide_context_free(MultiresUnsubdivideContext *context); /* Rebuilds all subdivision to the level 0 base mesh. */ bool multires_unsubdivide_to_basemesh(MultiresUnsubdivideContext *context); - -#endif /* __BKE_INTERN_MULTIRES_UNSUBDIVIDE_H__ */ diff --git a/source/blender/blenkernel/intern/ocean_intern.h b/source/blender/blenkernel/intern/ocean_intern.h index 7da88419219..39ce0db09d6 100644 --- a/source/blender/blenkernel/intern/ocean_intern.h +++ b/source/blender/blenkernel/intern/ocean_intern.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BKE_OCEAN_INTERN_H__ -#define __BKE_OCEAN_INTERN_H__ +#pragma once /** \file * \ingroup bli @@ -133,5 +132,3 @@ typedef struct Ocean { #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h index 6f8bae822ea..63bc8753fc7 100644 --- a/source/blender/blenkernel/intern/pbvh_intern.h +++ b/source/blender/blenkernel/intern/pbvh_intern.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __PBVH_INTERN_H__ -#define __PBVH_INTERN_H__ +#pragma once /** \file * \ingroup bli @@ -235,5 +234,3 @@ bool pbvh_bmesh_node_nearest_to_ray(PBVHNode *node, bool use_original); void pbvh_bmesh_normals_update(PBVHNode **nodes, int totnode); - -#endif diff --git a/source/blender/blenkernel/intern/subdiv_converter.h b/source/blender/blenkernel/intern/subdiv_converter.h index fb0e84ade13..ea0efe994b5 100644 --- a/source/blender/blenkernel/intern/subdiv_converter.h +++ b/source/blender/blenkernel/intern/subdiv_converter.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __SUBDIV_CONVERTER_H__ -#define __SUBDIV_CONVERTER_H__ +#pragma once /** \file * \ingroup bke @@ -51,5 +50,3 @@ int BKE_subdiv_converter_vtx_boundary_interpolation_from_settings(const SubdivSe /* TODO(sergey): Find a way to make it OpenSubdiv_FVarLinearInterpolation, * without breaking compilation without OpenSubdiv. */ int BKE_subdiv_converter_fvar_linear_from_settings(const SubdivSettings *settings); - -#endif /* __SUBDIV_CONVERTER_H__ */ diff --git a/source/blender/blenkernel/intern/subdiv_inline.h b/source/blender/blenkernel/intern/subdiv_inline.h index a51a33feb3d..ba45d0a4997 100644 --- a/source/blender/blenkernel/intern/subdiv_inline.h +++ b/source/blender/blenkernel/intern/subdiv_inline.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __SUBDIV_INLINE_H__ -#define __SUBDIV_INLINE_H__ +#pragma once #include "BLI_assert.h" #include "BLI_compiler_compat.h" @@ -114,5 +113,3 @@ BLI_INLINE float BKE_subdiv_edge_crease_to_sharpness_char(char edge_crease) const float edge_crease_f = edge_crease / 255.0f; return BKE_subdiv_edge_crease_to_sharpness_f(edge_crease_f); } - -#endif /* __SUBDIV_INLINE_H__ */ diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h index 67e9afdf7fa..7057e9ab5bd 100644 --- a/source/blender/blenkernel/nla_private.h +++ b/source/blender/blenkernel/nla_private.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __NLA_PRIVATE_H__ -#define __NLA_PRIVATE_H__ +#pragma once #include "BLI_bitmap.h" #include "BLI_ghash.h" @@ -190,5 +189,3 @@ void nladata_flush_channels(PointerRNA *ptr, #ifdef __cplusplus } #endif - -#endif /* __NLA_PRIVATE_H__ */ diff --git a/source/blender/blenkernel/particle_private.h b/source/blender/blenkernel/particle_private.h index 6f80089be29..33277d1caac 100644 --- a/source/blender/blenkernel/particle_private.h +++ b/source/blender/blenkernel/particle_private.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __PARTICLE_PRIVATE_H__ -#define __PARTICLE_PRIVATE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -72,5 +71,3 @@ void do_child_modifiers(const ParticleChildModifierContext *modifier_ctx, #ifdef __cplusplus } #endif - -#endif /* __PARTICLE_PRIVATE_H__ */ diff --git a/source/blender/blenkernel/tracking_private.h b/source/blender/blenkernel/tracking_private.h index 955a0b8753e..0965cef0d9b 100644 --- a/source/blender/blenkernel/tracking_private.h +++ b/source/blender/blenkernel/tracking_private.h @@ -24,8 +24,7 @@ * by multiple tracking files but which should not be public. */ -#ifndef __TRACKING_PRIVATE_H__ -#define __TRACKING_PRIVATE_H__ +#pragma once #include "BLI_threads.h" @@ -152,5 +151,3 @@ void tracking_image_accessor_destroy(TrackingImageAccessor *accessor); #ifdef __cplusplus } #endif - -#endif /* __TRACKING_PRIVATE_H__ */ |