diff options
Diffstat (limited to 'source/blender/editors')
112 files changed, 112 insertions, 446 deletions
diff --git a/source/blender/editors/animation/anim_intern.h b/source/blender/editors/animation/anim_intern.h index 7fb5540fdf7..fb7b6b8983a 100644 --- a/source/blender/editors/animation/anim_intern.h +++ b/source/blender/editors/animation/anim_intern.h @@ -21,8 +21,7 @@ * \ingroup edanimation */ -#ifndef __ANIM_INTERN_H__ -#define __ANIM_INTERN_H__ +#pragma once /* KeyingSets/Keyframing Interface ------------- */ @@ -77,5 +76,3 @@ void ANIM_OT_driver_button_remove(struct wmOperatorType *ot); void ANIM_OT_driver_button_edit(struct wmOperatorType *ot); void ANIM_OT_copy_driver_button(struct wmOperatorType *ot); void ANIM_OT_paste_driver_button(struct wmOperatorType *ot); - -#endif /* __ANIM_INTERN_H__ */ diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 08d82bf13c9..9a04425a083 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -21,8 +21,7 @@ * \ingroup edarmature */ -#ifndef __ARMATURE_INTERN_H__ -#define __ARMATURE_INTERN_H__ +#pragma once /* internal exports only */ struct wmOperatorType; @@ -289,5 +288,3 @@ int bone_looper(struct Object *ob, struct Bone *bone, void *data, int (*bone_func)(struct Object *, struct Bone *, void *)); - -#endif /* __ARMATURE_INTERN_H__ */ diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h index 0a9e6e878e4..0405e361b2f 100644 --- a/source/blender/editors/armature/meshlaplacian.h +++ b/source/blender/editors/armature/meshlaplacian.h @@ -20,8 +20,7 @@ * \ingroup edarmature */ -#ifndef __MESHLAPLACIAN_H__ -#define __MESHLAPLACIAN_H__ +#pragma once //#define RIGID_DEFORM @@ -70,5 +69,3 @@ void rigid_deform_end(int cancel); /* Harmonic Coordinates */ /* ED_mesh_deform_bind_callback(...) defined in ED_armature.h */ - -#endif diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h index 7d0a2e5edbc..4426739e421 100644 --- a/source/blender/editors/curve/curve_intern.h +++ b/source/blender/editors/curve/curve_intern.h @@ -21,8 +21,7 @@ * \ingroup edcurve */ -#ifndef __CURVE_INTERN_H__ -#define __CURVE_INTERN_H__ +#pragma once /* internal exports only */ struct EditNurb; @@ -194,5 +193,3 @@ void ED_curve_nurb_vert_selected_find( /* editcurve_paint.c */ void CURVE_OT_draw(struct wmOperatorType *ot); - -#endif /* __CURVE_INTERN_H__ */ diff --git a/source/blender/editors/gizmo_library/gizmo_geometry.h b/source/blender/editors/gizmo_library/gizmo_geometry.h index a5f61158f66..70f508df8b6 100644 --- a/source/blender/editors/gizmo_library/gizmo_geometry.h +++ b/source/blender/editors/gizmo_library/gizmo_geometry.h @@ -27,8 +27,7 @@ * called geom_xxx_gizmo.c */ -#ifndef __GIZMO_GEOMETRY_H__ -#define __GIZMO_GEOMETRY_H__ +#pragma once #include "BLI_sys_types.h" @@ -48,5 +47,3 @@ extern GizmoGeomInfo wm_gizmo_geom_data_cube; /* dial gizmo */ extern GizmoGeomInfo wm_gizmo_geom_data_dial; - -#endif /* __GIZMO_GEOMETRY_H__ */ diff --git a/source/blender/editors/gizmo_library/gizmo_library_intern.h b/source/blender/editors/gizmo_library/gizmo_library_intern.h index 31decb71c77..f3670708543 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_intern.h +++ b/source/blender/editors/gizmo_library/gizmo_library_intern.h @@ -21,8 +21,7 @@ * \ingroup edgizmolib */ -#ifndef __GIZMO_LIBRARY_INTERN_H__ -#define __GIZMO_LIBRARY_INTERN_H__ +#pragma once /** * Data for common interactions. Used in gizmo_library_utils.c functions. @@ -99,5 +98,3 @@ void wm_gizmo_geometryinfo_draw(const struct GizmoGeomInfo *info, const float color[4]); void wm_gizmo_vec_draw( const float color[4], const float (*verts)[3], uint vert_count, uint pos, uint primitive_type); - -#endif /* __GIZMO_LIBRARY_INTERN_H__ */ diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index 68424839ab0..fa75c2a7cee 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -21,8 +21,7 @@ * \ingroup edgpencil */ -#ifndef __GPENCIL_INTERN_H__ -#define __GPENCIL_INTERN_H__ +#pragma once #include "DNA_vec_types.h" @@ -732,5 +731,3 @@ struct GP_EditableStrokes_Iter { (void)0 /* ****************************************************** */ - -#endif /* __GPENCIL_INTERN_H__ */ diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index cfd92bf3113..3b7eb01f92c 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -21,8 +21,7 @@ * \ingroup editorui */ -#ifndef __BIF_GLUTIL_H__ -#define __BIF_GLUTIL_H__ +#pragma once #include "GPU_texture.h" @@ -175,5 +174,3 @@ void immDrawBorderCorners(unsigned int pos, const struct rcti *border, float zoo #ifdef __cplusplus } #endif - -#endif /* __BIF_GLUTIL_H__ */ diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 9d9f2925c23..36990414e6d 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_ANIM_API_H__ -#define __ED_ANIM_API_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -880,5 +879,3 @@ void animviz_get_object_motionpaths(struct Object *ob, ListBase *targets); #ifdef __cplusplus } #endif - -#endif /* __ED_ANIM_API_H__ */ diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 6749adb2ea0..62f4c068de0 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_ARMATURE_H__ -#define __ED_ARMATURE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -298,5 +297,3 @@ void ED_mesh_deform_bind_callback(struct MeshDeformModifierData *mmd, #ifdef __cplusplus } #endif - -#endif /* __ED_ARMATURE_H__ */ diff --git a/source/blender/editors/include/ED_buttons.h b/source/blender/editors/include/ED_buttons.h index 455eee8580d..ccef62eb8d2 100644 --- a/source/blender/editors/include/ED_buttons.h +++ b/source/blender/editors/include/ED_buttons.h @@ -20,8 +20,7 @@ * \ingroup editors */ -#ifndef __ED_BUTTONS_H__ -#define __ED_BUTTONS_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -34,5 +33,3 @@ int ED_buttons_tabs_list(struct SpaceProperties *sbuts, int *context_tabs_array) #ifdef __cplusplus } #endif - -#endif /* __ED_BUTTONS_H__ */ diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h index f270a0324f9..0a66c439f79 100644 --- a/source/blender/editors/include/ED_clip.h +++ b/source/blender/editors/include/ED_clip.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_CLIP_H__ -#define __ED_CLIP_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -106,5 +105,3 @@ void ED_operatormacros_clip(void); #ifdef __cplusplus } #endif - -#endif /* __ED_CLIP_H__ */ diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h index 79f5f62f293..f9b1d9cdc64 100644 --- a/source/blender/editors/include/ED_curve.h +++ b/source/blender/editors/include/ED_curve.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_CURVE_H__ -#define __ED_CURVE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -111,5 +110,3 @@ void printknots(struct Object *obedit); #ifdef __cplusplus } #endif - -#endif /* __ED_CURVE_H__ */ diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h index ad1cde5406d..ba77da24406 100644 --- a/source/blender/editors/include/ED_datafiles.h +++ b/source/blender/editors/include/ED_datafiles.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_DATAFILES_H__ -#define __ED_DATAFILES_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -301,5 +300,3 @@ extern char datatoc_gp_brush_erase_stroke_png[]; #ifdef __cplusplus } #endif - -#endif /* __ED_DATAFILES_H__ */ diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h index 8a239559627..deda0861b60 100644 --- a/source/blender/editors/include/ED_fileselect.h +++ b/source/blender/editors/include/ED_fileselect.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_FILESELECT_H__ -#define __ED_FILESELECT_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -214,5 +213,3 @@ void ED_fsmenu_entry_set_icon(struct FSMenuEntry *fsentry, const int icon); #ifdef __cplusplus } #endif - -#endif /* __ED_FILESELECT_H__ */ diff --git a/source/blender/editors/include/ED_gizmo_library.h b/source/blender/editors/include/ED_gizmo_library.h index a1a5d65b61d..0ee3b00e426 100644 --- a/source/blender/editors/include/ED_gizmo_library.h +++ b/source/blender/editors/include/ED_gizmo_library.h @@ -22,8 +22,7 @@ * This is exposes pre-defined gizmos for re-use. */ -#ifndef __ED_GIZMO_LIBRARY_H__ -#define __ED_GIZMO_LIBRARY_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -278,5 +277,3 @@ short ED_gizmotypes_snap_3d_update(struct wmGizmo *gz, #ifdef __cplusplus } #endif - -#endif /* __ED_GIZMO_LIBRARY_H__ */ diff --git a/source/blender/editors/include/ED_gizmo_utils.h b/source/blender/editors/include/ED_gizmo_utils.h index 70ff8a8d32f..0cfc3df9d54 100644 --- a/source/blender/editors/include/ED_gizmo_utils.h +++ b/source/blender/editors/include/ED_gizmo_utils.h @@ -20,8 +20,7 @@ * \name Generic Gizmo Utilities. */ -#ifndef __ED_GIZMO_UTILS_H__ -#define __ED_GIZMO_UTILS_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -46,5 +45,3 @@ bool ED_gizmo_poll_or_unlink_delayed_from_tool(const struct bContext *C, #ifdef __cplusplus } #endif - -#endif /* __ED_GIZMO_UTILS_H__ */ diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h index 64276706759..06839276027 100644 --- a/source/blender/editors/include/ED_gpencil.h +++ b/source/blender/editors/include/ED_gpencil.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_GPENCIL_H__ -#define __ED_GPENCIL_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -362,5 +361,3 @@ bool ED_gpencil_stroke_point_is_inside(struct bGPDstroke *gps, #ifdef __cplusplus } #endif - -#endif /* __ED_GPENCIL_H__ */ diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index e8343fbbc19..65ca181e160 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_IMAGE_H__ -#define __ED_IMAGE_H__ +#pragma once #include "DNA_listBase.h" #include "DNA_space_types.h" @@ -157,5 +156,3 @@ ListBase ED_image_filesel_detect_sequences(struct Main *bmain, #ifdef __cplusplus } #endif - -#endif /* __ED_IMAGE_H__ */ diff --git a/source/blender/editors/include/ED_info.h b/source/blender/editors/include/ED_info.h index e97fd424742..df6b6a20ddc 100644 --- a/source/blender/editors/include/ED_info.h +++ b/source/blender/editors/include/ED_info.h @@ -20,8 +20,7 @@ * \ingroup editors */ -#ifndef __ED_INFO_H__ -#define __ED_INFO_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -40,5 +39,3 @@ void ED_info_draw_stats( #ifdef __cplusplus } #endif - -#endif /* __ED_INFO_H__ */ diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h index 7000075d4b5..adc1e09821e 100644 --- a/source/blender/editors/include/ED_keyframes_draw.h +++ b/source/blender/editors/include/ED_keyframes_draw.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_KEYFRAMES_DRAW_H__ -#define __ED_KEYFRAMES_DRAW_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -273,5 +272,3 @@ int actkeyblock_get_valid_hold(ActKeyColumn *ab); #ifdef __cplusplus } #endif - -#endif /* __ED_KEYFRAMES_DRAW_H__ */ diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index 28bc0b22790..b08ab57545f 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_KEYFRAMES_EDIT_H__ -#define __ED_KEYFRAMES_EDIT_H__ +#pragma once #include "ED_anim_api.h" /* for enum eAnimFilter_Flags */ @@ -340,5 +339,3 @@ short paste_animedit_keys(struct bAnimContext *ac, #ifdef __cplusplus } #endif - -#endif /* __ED_KEYFRAMES_EDIT_H__ */ diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h index 3fe6407aae7..7f833cd59bf 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_KEYFRAMING_H__ -#define __ED_KEYFRAMING_H__ +#pragma once #include "DNA_anim_types.h" #include "RNA_types.h" @@ -516,5 +515,3 @@ bool ED_autokeyframe_property(struct bContext *C, #ifdef __cplusplus } #endif - -#endif /* __ED_KEYFRAMING_H__ */ diff --git a/source/blender/editors/include/ED_lattice.h b/source/blender/editors/include/ED_lattice.h index 2e4b9472ce7..6982ad20f07 100644 --- a/source/blender/editors/include/ED_lattice.h +++ b/source/blender/editors/include/ED_lattice.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_LATTICE_H__ -#define __ED_LATTICE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -51,5 +50,3 @@ void ED_lattice_undosys_type(struct UndoType *ut); #ifdef __cplusplus } #endif - -#endif /* __ED_LATTICE_H__ */ diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h index 54a5d0cb0e1..8c10a8e36fd 100644 --- a/source/blender/editors/include/ED_markers.h +++ b/source/blender/editors/include/ED_markers.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_MARKERS_H__ -#define __ED_MARKERS_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -77,5 +76,3 @@ void debug_markers_print_list(struct ListBase *markers); #ifdef __cplusplus } #endif - -#endif /* __ED_MARKERS_H__ */ diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h index 5aafc0702da..80510d3afa1 100644 --- a/source/blender/editors/include/ED_mask.h +++ b/source/blender/editors/include/ED_mask.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_MASK_H__ -#define __ED_MASK_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -125,5 +124,3 @@ void mirror_masklayer_frames(struct MaskLayer *mask_layer, short mode); #ifdef __cplusplus } #endif - -#endif /* __ED_MASK_H__ */ diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.h index 5c2106b934c..7648af159c9 100644 --- a/source/blender/editors/include/ED_mball.h +++ b/source/blender/editors/include/ED_mball.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_MBALL_H__ -#define __ED_MBALL_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -65,5 +64,3 @@ void ED_mball_undosys_type(struct UndoType *ut); #ifdef __cplusplus } #endif - -#endif /* __ED_MBALL_H__ */ diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 392a5075750..f2cad1acc84 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_MESH_H__ -#define __ED_MESH_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -517,5 +516,3 @@ void EDBM_mesh_elem_index_ensure_multi(struct Object **objects, #ifdef __cplusplus } #endif - -#endif /* __ED_MESH_H__ */ diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h index 382902cd2de..ecb98a46f99 100644 --- a/source/blender/editors/include/ED_node.h +++ b/source/blender/editors/include/ED_node.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_NODE_H__ -#define __ED_NODE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -127,5 +126,3 @@ bool ED_space_node_color_sample(struct Main *bmain, #ifdef __cplusplus } #endif - -#endif /* __ED_NODE_H__ */ diff --git a/source/blender/editors/include/ED_numinput.h b/source/blender/editors/include/ED_numinput.h index 16d05a7793a..6c5aacafc7a 100644 --- a/source/blender/editors/include/ED_numinput.h +++ b/source/blender/editors/include/ED_numinput.h @@ -18,8 +18,7 @@ * \ingroup editors */ -#ifndef __ED_NUMINPUT_H__ -#define __ED_NUMINPUT_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -115,5 +114,3 @@ bool user_string_to_number(bContext *C, #ifdef __cplusplus } #endif - -#endif /* __ED_NUMINPUT_H__ */ diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index e08be5937fe..4c7dd4fe66c 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_OBJECT_H__ -#define __ED_OBJECT_H__ +#pragma once #include "BLI_compiler_attrs.h" #include "DNA_object_enums.h" @@ -502,5 +501,3 @@ void ED_object_data_xform_tag_update(struct XFormObjectData *xod); #ifdef __cplusplus } #endif - -#endif /* __ED_OBJECT_H__ */ diff --git a/source/blender/editors/include/ED_outliner.h b/source/blender/editors/include/ED_outliner.h index 0325ad9fdba..9853b4644c1 100644 --- a/source/blender/editors/include/ED_outliner.h +++ b/source/blender/editors/include/ED_outliner.h @@ -20,8 +20,7 @@ * \ingroup editors */ -#ifndef __ED_OUTLINER_H__ -#define __ED_OUTLINER_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -53,5 +52,3 @@ void ED_outliner_select_sync_flag_outliners(const struct bContext *C); #ifdef __cplusplus } #endif - -#endif /* __ED_OUTLINER_H__ */ diff --git a/source/blender/editors/include/ED_paint.h b/source/blender/editors/include/ED_paint.h index 4159f22703f..3412d62317e 100644 --- a/source/blender/editors/include/ED_paint.h +++ b/source/blender/editors/include/ED_paint.h @@ -18,8 +18,7 @@ * \ingroup editors */ -#ifndef __ED_PAINT_H__ -#define __ED_PAINT_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -104,5 +103,3 @@ void ED_paintcurve_undosys_type(struct UndoType *ut); #ifdef __cplusplus } #endif - -#endif /* __ED_PAINT_H__ */ diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h index 789db5ae56e..e84298bd9c2 100644 --- a/source/blender/editors/include/ED_particle.h +++ b/source/blender/editors/include/ED_particle.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_PARTICLE_H__ -#define __ED_PARTICLE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -83,5 +82,3 @@ void ED_particle_undosys_type(struct UndoType *ut); #ifdef __cplusplus } #endif - -#endif /* __ED_PARTICLE_H__ */ diff --git a/source/blender/editors/include/ED_physics.h b/source/blender/editors/include/ED_physics.h index ebd7e387c83..f9c56f31ebd 100644 --- a/source/blender/editors/include/ED_physics.h +++ b/source/blender/editors/include/ED_physics.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_PHYSICS_H__ -#define __ED_PHYSICS_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -63,5 +62,3 @@ void ED_keymap_physics(struct wmKeyConfig *keyconf); #ifdef __cplusplus } #endif - -#endif /* __ED_PHYSICS_H__ */ diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h index ba70abcc055..d580e36d0ce 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_RENDER_H__ -#define __ED_RENDER_H__ +#pragma once #include "DNA_vec_types.h" @@ -110,5 +109,3 @@ void ED_render_internal_init(void); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/editors/include/ED_scene.h b/source/blender/editors/include/ED_scene.h index 27c2e9d0df8..e3abd26a4cd 100644 --- a/source/blender/editors/include/ED_scene.h +++ b/source/blender/editors/include/ED_scene.h @@ -18,8 +18,7 @@ * \ingroup editors */ -#ifndef __ED_SCENE_H__ -#define __ED_SCENE_H__ +#pragma once #include "BLI_compiler_attrs.h" @@ -46,5 +45,3 @@ void ED_operatortypes_scene(void); #ifdef __cplusplus } #endif - -#endif /* __ED_SCENE_H__ */ diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index fcc70a49d36..29fe766b2d0 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_SCREEN_H__ -#define __ED_SCREEN_H__ +#pragma once #include "DNA_screen_types.h" #include "DNA_space_types.h" @@ -483,5 +482,3 @@ enum { #ifdef __cplusplus } #endif - -#endif /* __ED_SCREEN_H__ */ diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h index 9826ec8c3b8..0185de426f3 100644 --- a/source/blender/editors/include/ED_screen_types.h +++ b/source/blender/editors/include/ED_screen_types.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_SCREEN_TYPES_H__ -#define __ED_SCREEN_TYPES_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -140,5 +139,3 @@ enum { #ifdef __cplusplus } #endif - -#endif /* __ED_SCREEN_TYPES_H__ */ diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h index e61c7be5216..c3abde479f1 100644 --- a/source/blender/editors/include/ED_sculpt.h +++ b/source/blender/editors/include/ED_sculpt.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_SCULPT_H__ -#define __ED_SCULPT_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -62,5 +61,3 @@ void ED_sculpt_undo_push_multires_mesh_end(struct bContext *C, const char *str); #ifdef __cplusplus } #endif - -#endif /* __ED_SCULPT_H__ */ diff --git a/source/blender/editors/include/ED_select_utils.h b/source/blender/editors/include/ED_select_utils.h index 9c7cc0ef7a2..049ea7a092f 100644 --- a/source/blender/editors/include/ED_select_utils.h +++ b/source/blender/editors/include/ED_select_utils.h @@ -18,8 +18,7 @@ * \ingroup editors */ -#ifndef __ED_SELECT_UTILS_H__ -#define __ED_SELECT_UTILS_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -78,5 +77,3 @@ eSelectOp ED_select_op_modal(const eSelectOp sel_op, const bool is_first); #ifdef __cplusplus } #endif - -#endif /* __ED_SELECT_UTILS_H__ */ diff --git a/source/blender/editors/include/ED_sequencer.h b/source/blender/editors/include/ED_sequencer.h index f35ed12cdb9..11eff2d583b 100644 --- a/source/blender/editors/include/ED_sequencer.h +++ b/source/blender/editors/include/ED_sequencer.h @@ -20,8 +20,7 @@ * \ingroup editors */ -#ifndef __ED_SEQUENCER_H__ -#define __ED_SEQUENCER_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -53,5 +52,3 @@ void ED_sequencer_special_preview_clear(void); #ifdef __cplusplus } #endif - -#endif /* __ED_SEQUENCER_H__ */ diff --git a/source/blender/editors/include/ED_sound.h b/source/blender/editors/include/ED_sound.h index f7632bc81cb..022c7784ed3 100644 --- a/source/blender/editors/include/ED_sound.h +++ b/source/blender/editors/include/ED_sound.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_SOUND_H__ -#define __ED_SOUND_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -33,5 +32,3 @@ void ED_operatortypes_sound(void); #ifdef __cplusplus } #endif - -#endif /* __ED_SOUND_H__ */ diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h index ae4add2fca2..f3e867e8360 100644 --- a/source/blender/editors/include/ED_space_api.h +++ b/source/blender/editors/include/ED_space_api.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_SPACE_API_H__ -#define __ED_SPACE_API_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -83,5 +82,3 @@ void ED_region_draw_mouse_line_cb(const struct bContext *C, #ifdef __cplusplus } #endif - -#endif /* __ED_SPACE_API_H__ */ diff --git a/source/blender/editors/include/ED_text.h b/source/blender/editors/include/ED_text.h index 4f7b76675f0..6742561735e 100644 --- a/source/blender/editors/include/ED_text.h +++ b/source/blender/editors/include/ED_text.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_TEXT_H__ -#define __ED_TEXT_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -51,5 +50,3 @@ bool ED_text_is_syntax_highlight_supported(struct Text *text); #ifdef __cplusplus } #endif - -#endif /* __ED_TEXT_H__ */ diff --git a/source/blender/editors/include/ED_time_scrub_ui.h b/source/blender/editors/include/ED_time_scrub_ui.h index 483dce56577..216e67dd820 100644 --- a/source/blender/editors/include/ED_time_scrub_ui.h +++ b/source/blender/editors/include/ED_time_scrub_ui.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_TIME_SCRUB_UI_H__ -#define __ED_TIME_SCRUB_UI_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -51,5 +50,3 @@ void ED_time_scrub_channel_search_draw(const struct bContext *C, #ifdef __cplusplus } #endif - -#endif /* __ED_TIME_SCRUB_UI_H__ */ diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 29ed0485490..4c4672edffc 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_TRANSFORM_H__ -#define __ED_TRANSFORM_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -215,5 +214,3 @@ int ED_transform_calc_gizmo_stats(const struct bContext *C, #ifdef __cplusplus } #endif - -#endif /* __ED_TRANSFORM_H__ */ diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h index 8feb73436a6..ebaa32941f2 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -18,8 +18,7 @@ * \ingroup editors */ -#ifndef __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__ -#define __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -157,5 +156,3 @@ bool ED_transform_snap_object_project_all_view3d_ex(SnapObjectContext *sctx, #ifdef __cplusplus } #endif - -#endif /* __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__ */ diff --git a/source/blender/editors/include/ED_transverts.h b/source/blender/editors/include/ED_transverts.h index 062658a562b..bff31149b75 100644 --- a/source/blender/editors/include/ED_transverts.h +++ b/source/blender/editors/include/ED_transverts.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_TRANSVERTS_H__ -#define __ED_TRANSVERTS_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -75,5 +74,3 @@ enum { #ifdef __cplusplus } #endif - -#endif /* __ED_TRANSVERTS_H__ */ diff --git a/source/blender/editors/include/ED_types.h b/source/blender/editors/include/ED_types.h index 4abb7d446d1..ab9098a33c5 100644 --- a/source/blender/editors/include/ED_types.h +++ b/source/blender/editors/include/ED_types.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_TYPES_H__ -#define __ED_TYPES_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -42,5 +41,3 @@ extern "C" { #ifdef __cplusplus } #endif - -#endif /* __ED_TYPES_H__ */ diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.h index 983e0c4f14a..dbd374415b0 100644 --- a/source/blender/editors/include/ED_undo.h +++ b/source/blender/editors/include/ED_undo.h @@ -18,8 +18,7 @@ * \ingroup editors */ -#ifndef __ED_UNDO_H__ -#define __ED_UNDO_H__ +#pragma once #include "BLI_compiler_attrs.h" @@ -89,5 +88,3 @@ struct MemFile *ED_undosys_stack_memfile_get_active(struct UndoStack *ustack); #ifdef __cplusplus } #endif - -#endif /* __ED_UNDO_H__ */ diff --git a/source/blender/editors/include/ED_userpref.h b/source/blender/editors/include/ED_userpref.h index 1d43009e37c..e588fa31ad5 100644 --- a/source/blender/editors/include/ED_userpref.h +++ b/source/blender/editors/include/ED_userpref.h @@ -18,8 +18,7 @@ * \ingroup editors */ -#ifndef __ED_USERPREF_H__ -#define __ED_USERPREF_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -30,5 +29,3 @@ void ED_operatortypes_userpref(void); #ifdef __cplusplus } #endif - -#endif /* __ED_USERPREF_H__ */ diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index 1f2706957a7..68ae3589064 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_UTIL_H__ -#define __ED_UTIL_H__ +#pragma once #include "BLI_compiler_attrs.h" @@ -71,5 +70,3 @@ void unpack_menu(struct bContext *C, #ifdef __cplusplus } #endif - -#endif /* __ED_UTIL_H__ */ diff --git a/source/blender/editors/include/ED_util_imbuf.h b/source/blender/editors/include/ED_util_imbuf.h index 76171383b49..d142d3d6425 100644 --- a/source/blender/editors/include/ED_util_imbuf.h +++ b/source/blender/editors/include/ED_util_imbuf.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_UTIL_IMBUF_H__ -#define __ED_UTIL_IMBUF_H__ +#pragma once #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" @@ -48,5 +47,3 @@ bool ED_imbuf_sample_poll(struct bContext *C); #ifdef __cplusplus } #endif - -#endif /* __ED_UTIL_IMBUF_H__ */ diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 935b99ba8e8..53fb79bb012 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_UVEDIT_H__ -#define __ED_UVEDIT_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -243,5 +242,3 @@ void ED_uvedit_buttons_register(struct ARegionType *art); #ifdef __cplusplus } #endif - -#endif /* __ED_UVEDIT_H__ */ diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index bc542084292..ddbea592238 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_VIEW3D_H__ -#define __ED_VIEW3D_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -750,5 +749,3 @@ bool ED_view3d_is_region_xr_mirror_active(const struct wmWindowManager *wm, #ifdef __cplusplus } #endif - -#endif /* __ED_VIEW3D_H__ */ diff --git a/source/blender/editors/include/ED_view3d_offscreen.h b/source/blender/editors/include/ED_view3d_offscreen.h index 846f4d7eabb..2833d205e77 100644 --- a/source/blender/editors/include/ED_view3d_offscreen.h +++ b/source/blender/editors/include/ED_view3d_offscreen.h @@ -21,8 +21,7 @@ * \ingroup editors */ -#ifndef __ED_VIEW3D_OFFSCREEN_H__ -#define __ED_VIEW3D_OFFSCREEN_H__ +#pragma once #include "DNA_object_enums.h" #include "DNA_view3d_types.h" @@ -106,5 +105,3 @@ struct ImBuf *ED_view3d_draw_offscreen_imbuf_simple(struct Depsgraph *depsgraph, #ifdef __cplusplus } #endif - -#endif /* __ED_VIEW3D_H__ */ diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 2c42f3a5071..184032df3c6 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -21,8 +21,7 @@ * \ingroup editorui */ -#ifndef __UI_INTERFACE_H__ -#define __UI_INTERFACE_H__ +#pragma once #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" /* size_t */ @@ -2577,5 +2576,3 @@ void UI_interface_tag_script_reload(void); #ifdef __cplusplus } #endif - -#endif /* __UI_INTERFACE_H__ */ diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index 0529ee08da6..7b59d45b203 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -21,8 +21,7 @@ * \ingroup editorui */ -#ifndef __UI_INTERFACE_ICONS_H__ -#define __UI_INTERFACE_ICONS_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -111,5 +110,3 @@ int UI_library_icon_get(const struct ID *id); #ifdef __cplusplus } #endif - -#endif /* __UI_INTERFACE_ICONS_H__ */ diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index c5c4ca79f14..3f548f98e97 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -21,8 +21,7 @@ * \ingroup editorui */ -#ifndef __UI_RESOURCES_H__ -#define __UI_RESOURCES_H__ +#pragma once #include "BLI_sys_types.h" @@ -458,5 +457,3 @@ void UI_make_axis_color(const unsigned char *src_col, unsigned char *dst_col, co #ifdef __cplusplus } #endif - -#endif /* __UI_RESOURCES_H__ */ diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index 0ddc45f4878..6e0f4434b7b 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -23,8 +23,7 @@ * \ingroup editorui */ -#ifndef __UI_VIEW2D_H__ -#define __UI_VIEW2D_H__ +#pragma once #include "BLI_compiler_attrs.h" @@ -288,5 +287,3 @@ void VIEW2D_GGT_navigate_impl(struct wmGizmoGroupType *gzgt, const char *idname) #ifdef __cplusplus } #endif - -#endif /* __UI_VIEW2D_H__ */ diff --git a/source/blender/editors/interface/interface_eyedropper_intern.h b/source/blender/editors/interface/interface_eyedropper_intern.h index cabf997b725..fd60dcb7c86 100644 --- a/source/blender/editors/interface/interface_eyedropper_intern.h +++ b/source/blender/editors/interface/interface_eyedropper_intern.h @@ -20,8 +20,7 @@ * Share between interface_eyedropper_*.c files. */ -#ifndef __INTERFACE_EYEDROPPER_INTERN_H__ -#define __INTERFACE_EYEDROPPER_INTERN_H__ +#pragma once /* interface_eyedropper.c */ void eyedropper_draw_cursor_text(const struct bContext *C, @@ -48,5 +47,3 @@ enum { EYE_MODAL_POINT_RESET, EYE_MODAL_POINT_REMOVE_LAST, }; - -#endif /* __INTERFACE_EYEDROPPER_INTERN_H__ */ diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 92efa27f916..bf2971f93df 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -21,8 +21,7 @@ * \ingroup edinterface */ -#ifndef __INTERFACE_INTERN_H__ -#define __INTERFACE_INTERN_H__ +#pragma once #include "BLI_compiler_attrs.h" #include "BLI_rect.h" @@ -1078,5 +1077,3 @@ bool ui_jump_to_target_button_poll(struct bContext *C); /* interface_queries.c */ void ui_interface_tag_script_reload_queries(void); - -#endif /* __INTERFACE_INTERN_H__ */ diff --git a/source/blender/editors/interface/interface_regions_intern.h b/source/blender/editors/interface/interface_regions_intern.h index c299562a357..0cb1fee9a92 100644 --- a/source/blender/editors/interface/interface_regions_intern.h +++ b/source/blender/editors/interface/interface_regions_intern.h @@ -20,8 +20,7 @@ * Share between interface_region_*.c files. */ -#ifndef __INTERFACE_REGIONS_INTERN_H__ -#define __INTERFACE_REGIONS_INTERN_H__ +#pragma once /* interface_region_menu_popup.c */ uint ui_popup_menu_hash(const char *str); @@ -29,5 +28,3 @@ uint ui_popup_menu_hash(const char *str); /* interface_regions_intern.h */ ARegion *ui_region_temp_add(bScreen *screen); void ui_region_temp_remove(struct bContext *C, bScreen *screen, ARegion *region); - -#endif /* __INTERFACE_REGIONS_INTERN_H__ */ diff --git a/source/blender/editors/io/io_alembic.h b/source/blender/editors/io/io_alembic.h index ecd8c1818f8..512f4e4636b 100644 --- a/source/blender/editors/io/io_alembic.h +++ b/source/blender/editors/io/io_alembic.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __IO_ALEMBIC_H__ -#define __IO_ALEMBIC_H__ +#pragma once /** \file * \ingroup editor/io @@ -28,5 +27,3 @@ struct wmOperatorType; void WM_OT_alembic_export(struct wmOperatorType *ot); void WM_OT_alembic_import(struct wmOperatorType *ot); - -#endif /* __IO_ALEMBIC_H__ */ diff --git a/source/blender/editors/io/io_cache.h b/source/blender/editors/io/io_cache.h index c6fc50a236e..be6e31842af 100644 --- a/source/blender/editors/io/io_cache.h +++ b/source/blender/editors/io/io_cache.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __IO_CACHE_H__ -#define __IO_CACHE_H__ +#pragma once /** \file * \ingroup editor/io @@ -28,5 +27,3 @@ struct wmOperatorType; void CACHEFILE_OT_open(struct wmOperatorType *ot); void CACHEFILE_OT_reload(struct wmOperatorType *ot); - -#endif /* __IO_CACHE_H__ */ diff --git a/source/blender/editors/io/io_collada.h b/source/blender/editors/io/io_collada.h index 6330fc9639a..5c0a1a8b927 100644 --- a/source/blender/editors/io/io_collada.h +++ b/source/blender/editors/io/io_collada.h @@ -21,12 +21,9 @@ * \ingroup editor/io */ -#ifndef __IO_COLLADA_H__ -#define __IO_COLLADA_H__ +#pragma once struct wmOperatorType; void WM_OT_collada_export(struct wmOperatorType *ot); void WM_OT_collada_import(struct wmOperatorType *ot); - -#endif diff --git a/source/blender/editors/io/io_ops.h b/source/blender/editors/io/io_ops.h index 2923e052752..2e6cccbf438 100644 --- a/source/blender/editors/io/io_ops.h +++ b/source/blender/editors/io/io_ops.h @@ -21,9 +21,6 @@ * \ingroup editor/io */ -#ifndef __IO_OPS_H__ -#define __IO_OPS_H__ +#pragma once void ED_operatortypes_io(void); - -#endif diff --git a/source/blender/editors/io/io_usd.h b/source/blender/editors/io/io_usd.h index c794dc744df..671984b6f34 100644 --- a/source/blender/editors/io/io_usd.h +++ b/source/blender/editors/io/io_usd.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __IO_USD_H__ -#define __IO_USD_H__ +#pragma once /** \file * \ingroup editor/io @@ -27,5 +26,3 @@ struct wmOperatorType; void WM_OT_usd_export(struct wmOperatorType *ot); - -#endif /* __IO_USD_H__ */ diff --git a/source/blender/editors/lattice/lattice_intern.h b/source/blender/editors/lattice/lattice_intern.h index fe3f35b9223..ee324a3b31e 100644 --- a/source/blender/editors/lattice/lattice_intern.h +++ b/source/blender/editors/lattice/lattice_intern.h @@ -21,8 +21,7 @@ * \ingroup edlattice */ -#ifndef __LATTICE_INTERN_H__ -#define __LATTICE_INTERN_H__ +#pragma once /* editlattice_select.c */ void LATTICE_OT_select_all(struct wmOperatorType *ot); @@ -35,5 +34,3 @@ void LATTICE_OT_select_mirror(struct wmOperatorType *ot); /* editlattice_tools.c */ void LATTICE_OT_make_regular(struct wmOperatorType *ot); void LATTICE_OT_flip(struct wmOperatorType *ot); - -#endif /* __LATTICE_INTERN_H__ */ diff --git a/source/blender/editors/mask/mask_intern.h b/source/blender/editors/mask/mask_intern.h index 6a45af4d2a6..f6990583383 100644 --- a/source/blender/editors/mask/mask_intern.h +++ b/source/blender/editors/mask/mask_intern.h @@ -21,8 +21,7 @@ * \ingroup spclip */ -#ifndef __MASK_INTERN_H__ -#define __MASK_INTERN_H__ +#pragma once struct Mask; struct bContext; @@ -130,5 +129,3 @@ void MASK_OT_shape_key_insert(struct wmOperatorType *ot); void MASK_OT_shape_key_clear(struct wmOperatorType *ot); void MASK_OT_shape_key_feather_reset(struct wmOperatorType *ot); void MASK_OT_shape_key_rekey(struct wmOperatorType *ot); - -#endif /* __MASK_INTERN_H__ */ diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index cec425d687d..bb5da8f3a9c 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -23,8 +23,7 @@ /* Internal for editmesh_xxxx.c functions */ -#ifndef __MESH_INTERN_H__ -#define __MESH_INTERN_H__ +#pragma once struct BMEditMesh; struct BMElem; @@ -276,5 +275,3 @@ void MESH_OT_customdata_skin_add(struct wmOperatorType *ot); void MESH_OT_customdata_skin_clear(struct wmOperatorType *ot); void MESH_OT_customdata_custom_splitnormals_add(struct wmOperatorType *ot); void MESH_OT_customdata_custom_splitnormals_clear(struct wmOperatorType *ot); - -#endif /* __MESH_INTERN_H__ */ diff --git a/source/blender/editors/metaball/mball_intern.h b/source/blender/editors/metaball/mball_intern.h index dec94f97b8a..2b90667f612 100644 --- a/source/blender/editors/metaball/mball_intern.h +++ b/source/blender/editors/metaball/mball_intern.h @@ -21,8 +21,7 @@ * \ingroup edmeta */ -#ifndef __MBALL_INTERN_H__ -#define __MBALL_INTERN_H__ +#pragma once #include "DNA_object_types.h" @@ -37,5 +36,3 @@ void MBALL_OT_duplicate_metaelems(struct wmOperatorType *ot); void MBALL_OT_select_all(struct wmOperatorType *ot); void MBALL_OT_select_similar(struct wmOperatorType *ot); void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot); - -#endif diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 9dc204b9083..bc3c263e0a3 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -21,8 +21,7 @@ * \ingroup edobj */ -#ifndef __OBJECT_INTERN_H__ -#define __OBJECT_INTERN_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -311,5 +310,3 @@ void OBJECT_OT_datalayout_transfer(struct wmOperatorType *ot); #ifdef __cplusplus } #endif - -#endif /* __OBJECT_INTERN_H__ */ diff --git a/source/blender/editors/physics/particle_edit_utildefines.h b/source/blender/editors/physics/particle_edit_utildefines.h index dc858687341..289ca193f17 100644 --- a/source/blender/editors/physics/particle_edit_utildefines.h +++ b/source/blender/editors/physics/particle_edit_utildefines.h @@ -21,8 +21,7 @@ * \ingroup edphys */ -#ifndef __PARTICLE_EDIT_UTILDEFINES_H__ -#define __PARTICLE_EDIT_UTILDEFINES_H__ +#pragma once #define KEY_K \ PTCacheEditKey *key; \ @@ -58,5 +57,3 @@ if (key->flag & PEK_TAG) #define KEY_WCO ((key->flag & PEK_USE_WCO) ? key->world_co : key->co) - -#endif /* __PARTICLE_EDIT_UTILDEFINES_H__ */ diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h index 87c3a709d47..4dc3ded9bd7 100644 --- a/source/blender/editors/physics/physics_intern.h +++ b/source/blender/editors/physics/physics_intern.h @@ -21,8 +21,7 @@ * \ingroup edphys */ -#ifndef __PHYSICS_INTERN_H__ -#define __PHYSICS_INTERN_H__ +#pragma once struct Depsgraph; struct Object; @@ -152,5 +151,3 @@ void RIGIDBODY_OT_constraint_remove(struct wmOperatorType *ot); void RIGIDBODY_OT_world_add(struct wmOperatorType *ot); void RIGIDBODY_OT_world_remove(struct wmOperatorType *ot); void RIGIDBODY_OT_world_export(struct wmOperatorType *ot); - -#endif /* __PHYSICS_INTERN_H__ */ diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h index 88b913b84ca..d3a06f0fc2c 100644 --- a/source/blender/editors/render/render_intern.h +++ b/source/blender/editors/render/render_intern.h @@ -21,8 +21,7 @@ * \ingroup edrend */ -#ifndef __RENDER_INTERN_H__ -#define __RENDER_INTERN_H__ +#pragma once struct ScrArea; struct bContext; @@ -90,5 +89,3 @@ void RENDER_OT_view_cancel(struct wmOperatorType *ot); /* render_opengl.c */ void RENDER_OT_opengl(struct wmOperatorType *ot); - -#endif /* __RENDER_INTERN_H__ */ diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h index b96890c7db3..a5b5e222ae9 100644 --- a/source/blender/editors/screen/screen_intern.h +++ b/source/blender/editors/screen/screen_intern.h @@ -21,8 +21,7 @@ * \ingroup edscr */ -#ifndef __SCREEN_INTERN_H__ -#define __SCREEN_INTERN_H__ +#pragma once struct Main; struct bContext; @@ -97,5 +96,3 @@ void SCREEN_OT_screenshot(struct wmOperatorType *ot); /* workspace_layout_edit.c */ bool workspace_layout_set_poll(const struct WorkSpaceLayout *layout); - -#endif /* __SCREEN_INTERN_H__ */ diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index feadeb28cd5..65f78a2d988 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -21,8 +21,7 @@ * \ingroup edsculpt */ -#ifndef __PAINT_INTERN_H__ -#define __PAINT_INTERN_H__ +#pragma once struct ARegion; struct Brush; @@ -367,5 +366,3 @@ void paint_delete_blur_kernel(BlurKernel *); /* paint curve defines */ #define PAINT_CURVE_NUM_SEGMENTS 40 - -#endif /* __PAINT_INTERN_H__ */ diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 7daf94b88c8..74feaa8ca00 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -21,8 +21,7 @@ * \ingroup edsculpt */ -#ifndef __SCULPT_INTERN_H__ -#define __SCULPT_INTERN_H__ +#pragma once #include "DNA_brush_types.h" #include "DNA_key_types.h" @@ -997,5 +996,3 @@ void SCULPT_OT_set_detail_size(struct wmOperatorType *ot); /* Dyntopo. */ void SCULPT_OT_dynamic_topology_toggle(struct wmOperatorType *ot); - -#endif diff --git a/source/blender/editors/sound/sound_intern.h b/source/blender/editors/sound/sound_intern.h index 40cdb9ccf02..f4797838be0 100644 --- a/source/blender/editors/sound/sound_intern.h +++ b/source/blender/editors/sound/sound_intern.h @@ -21,7 +21,4 @@ * \ingroup edsnd */ -#ifndef __SOUND_INTERN_H__ -#define __SOUND_INTERN_H__ - -#endif /* __SOUND_INTERN_H__ */ +#pragma once diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h index bf1b90bbe98..ffe0606c98f 100644 --- a/source/blender/editors/space_action/action_intern.h +++ b/source/blender/editors/space_action/action_intern.h @@ -21,8 +21,7 @@ * \ingroup spaction */ -#ifndef __ACTION_INTERN_H__ -#define __ACTION_INTERN_H__ +#pragma once struct ARegion; struct ARegionType; @@ -142,5 +141,3 @@ enum eActKeys_Mirror_Mode { /* action_ops.c */ void action_operatortypes(void); void action_keymap(struct wmKeyConfig *keyconf); - -#endif /* __ACTION_INTERN_H__ */ diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h index 64166f15ea3..911cf4526bb 100644 --- a/source/blender/editors/space_buttons/buttons_intern.h +++ b/source/blender/editors/space_buttons/buttons_intern.h @@ -21,8 +21,7 @@ * \ingroup spbuttons */ -#ifndef __BUTTONS_INTERN_H__ -#define __BUTTONS_INTERN_H__ +#pragma once #include "DNA_listBase.h" #include "RNA_types.h" @@ -97,5 +96,3 @@ void buttons_texture_context_compute(const struct bContext *C, struct SpacePrope void BUTTONS_OT_file_browse(struct wmOperatorType *ot); void BUTTONS_OT_directory_browse(struct wmOperatorType *ot); void BUTTONS_OT_context_menu(struct wmOperatorType *ot); - -#endif /* __BUTTONS_INTERN_H__ */ diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h index 27493bb5ccd..4848ec72f79 100644 --- a/source/blender/editors/space_clip/clip_intern.h +++ b/source/blender/editors/space_clip/clip_intern.h @@ -21,8 +21,7 @@ * \ingroup spclip */ -#ifndef __CLIP_INTERN_H__ -#define __CLIP_INTERN_H__ +#pragma once struct ARegion; struct MovieClip; @@ -245,5 +244,3 @@ void CLIP_OT_select_box(struct wmOperatorType *ot); void CLIP_OT_select_lasso(struct wmOperatorType *ot); void CLIP_OT_select_circle(struct wmOperatorType *ot); void CLIP_OT_select_grouped(struct wmOperatorType *ot); - -#endif /* __CLIP_INTERN_H__ */ diff --git a/source/blender/editors/space_clip/tracking_ops_intern.h b/source/blender/editors/space_clip/tracking_ops_intern.h index c29a485e234..5a9a84a235b 100644 --- a/source/blender/editors/space_clip/tracking_ops_intern.h +++ b/source/blender/editors/space_clip/tracking_ops_intern.h @@ -21,8 +21,7 @@ * \ingroup spclip */ -#ifndef __TRACKING_OPS_INTERN_H__ -#define __TRACKING_OPS_INTERN_H__ +#pragma once struct ListBase; struct MovieClip; @@ -40,5 +39,3 @@ void clip_tracking_hide_cursor(struct bContext *C); void ed_tracking_deselect_all_tracks(struct ListBase *tracks_base); void ed_tracking_deselect_all_plane_tracks(struct ListBase *plane_tracks_base); - -#endif /* __TRACKING_OPS_INTERN_H__ */ diff --git a/source/blender/editors/space_console/console_intern.h b/source/blender/editors/space_console/console_intern.h index d051e351f3e..d4cb8363266 100644 --- a/source/blender/editors/space_console/console_intern.h +++ b/source/blender/editors/space_console/console_intern.h @@ -18,8 +18,7 @@ * \ingroup spconsole */ -#ifndef __CONSOLE_INTERN_H__ -#define __CONSOLE_INTERN_H__ +#pragma once /* internal exports only */ @@ -75,5 +74,3 @@ enum { DEL_NEXT_SEL, DEL_PREV_SEL }; - -#endif /* __CONSOLE_INTERN_H__ */ diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index b7e8d35ffee..44131693628 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -21,8 +21,7 @@ * \ingroup spfile */ -#ifndef __FILE_INTERN_H__ -#define __FILE_INTERN_H__ +#pragma once /* internal exports only */ @@ -116,5 +115,3 @@ void file_execute_region_panels_register(struct ARegionType *art); /* file_utils.c */ void file_tile_boundbox(const ARegion *region, FileLayout *layout, const int file, rcti *r_bounds); - -#endif /* __FILE_INTERN_H__ */ diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h index e90a8659417..53937e7a743 100644 --- a/source/blender/editors/space_file/filelist.h +++ b/source/blender/editors/space_file/filelist.h @@ -21,8 +21,7 @@ * \ingroup spfile */ -#ifndef __FILELIST_H__ -#define __FILELIST_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -139,5 +138,3 @@ bool filelist_cache_previews_running(struct FileList *filelist); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h index 17cfdf1c7f0..c4af27a25aa 100644 --- a/source/blender/editors/space_file/fsmenu.h +++ b/source/blender/editors/space_file/fsmenu.h @@ -21,8 +21,7 @@ * \ingroup spfile */ -#ifndef __FSMENU_H__ -#define __FSMENU_H__ +#pragma once /* XXX could become UserPref */ #define FSMENU_RECENT_MAX 10 @@ -76,5 +75,3 @@ void fsmenu_refresh_bookmarks_status(struct wmWindowManager *wm, struct FSMenu * int fsmenu_get_active_indices(struct FSMenu *fsmenu, enum FSMenuCategory category, const char *dir); - -#endif diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h index 3ec36e43278..d00e911e3fc 100644 --- a/source/blender/editors/space_graph/graph_intern.h +++ b/source/blender/editors/space_graph/graph_intern.h @@ -21,8 +21,7 @@ * \ingroup spgraph */ -#ifndef __GRAPH_INTERN_H__ -#define __GRAPH_INTERN_H__ +#pragma once struct ARegion; struct ARegionType; @@ -177,5 +176,3 @@ bool graphop_selected_fcurve_poll(struct bContext *C); /* graph_ops.c */ void graphedit_keymap(struct wmKeyConfig *keyconf); void graphedit_operatortypes(void); - -#endif /* __GRAPH_INTERN_H__ */ diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h index ae26363ad79..e6f5988aed8 100644 --- a/source/blender/editors/space_image/image_intern.h +++ b/source/blender/editors/space_image/image_intern.h @@ -21,8 +21,7 @@ * \ingroup spimage */ -#ifndef __IMAGE_INTERN_H__ -#define __IMAGE_INTERN_H__ +#pragma once /* internal exports only */ struct ARegion; @@ -96,5 +95,3 @@ void IMAGE_OT_tile_fill(struct wmOperatorType *ot); /* image_panels.c */ struct ImageUser *ntree_get_active_iuser(struct bNodeTree *ntree); void image_buttons_register(struct ARegionType *art); - -#endif /* __IMAGE_INTERN_H__ */ diff --git a/source/blender/editors/space_info/info_intern.h b/source/blender/editors/space_info/info_intern.h index 79bfb1fa047..a19ebe5ef04 100644 --- a/source/blender/editors/space_info/info_intern.h +++ b/source/blender/editors/space_info/info_intern.h @@ -21,8 +21,7 @@ * \ingroup spinfo */ -#ifndef __INFO_INTERN_H__ -#define __INFO_INTERN_H__ +#pragma once /* internal exports only */ @@ -65,5 +64,3 @@ void INFO_OT_select_box(struct wmOperatorType *ot); void INFO_OT_report_replay(struct wmOperatorType *ot); void INFO_OT_report_delete(struct wmOperatorType *ot); void INFO_OT_report_copy(struct wmOperatorType *ot); - -#endif /* __INFO_INTERN_H__ */ diff --git a/source/blender/editors/space_info/textview.h b/source/blender/editors/space_info/textview.h index 41f8baf634e..7520dbce191 100644 --- a/source/blender/editors/space_info/textview.h +++ b/source/blender/editors/space_info/textview.h @@ -18,8 +18,7 @@ * \ingroup spinfo */ -#ifndef __TEXTVIEW_H__ -#define __TEXTVIEW_H__ +#pragma once enum eTextViewContext_LineFlag { TVC_LINE_FG = (1 << 0), @@ -79,5 +78,3 @@ int textview_draw(struct TextViewContext *tvc, const int mval_init[2], void **r_mval_pick_item, int *r_mval_pick_offset); - -#endif /* __TEXTVIEW_H__ */ diff --git a/source/blender/editors/space_nla/nla_intern.h b/source/blender/editors/space_nla/nla_intern.h index 6b0429230fe..9a9ea161f56 100644 --- a/source/blender/editors/space_nla/nla_intern.h +++ b/source/blender/editors/space_nla/nla_intern.h @@ -21,8 +21,7 @@ * \ingroup spnla */ -#ifndef __NLA_INTERN_H__ -#define __NLA_INTERN_H__ +#pragma once /* internal exports only */ @@ -149,5 +148,3 @@ bool nlaedit_is_tweakmode_on(bAnimContext *ac); void nla_operatortypes(void); void nla_keymap(wmKeyConfig *keyconf); - -#endif /* __NLA_INTERN_H__ */ diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 04186c3a727..9461892360e 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -21,8 +21,7 @@ * \ingroup spnode */ -#ifndef __NODE_INTERN_H__ -#define __NODE_INTERN_H__ +#pragma once #include "BKE_node.h" #include "UI_interface.h" @@ -301,5 +300,3 @@ enum eNodeSpace_ButEvents { B_NODE_LOADIMAGE, B_NODE_SETIMAGE, }; - -#endif /* __NODE_INTERN_H__ */ diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 186a66a95c0..05729414f91 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -21,8 +21,7 @@ * \ingroup spoutliner */ -#ifndef __OUTLINER_INTERN_H__ -#define __OUTLINER_INTERN_H__ +#pragma once #include "RNA_types.h" @@ -517,5 +516,3 @@ void outliner_scroll_view(struct ARegion *region, int delta_y); /* outliner_sync.c ---------------------------------------------- */ void outliner_sync_selection(const struct bContext *C, struct SpaceOutliner *soops); - -#endif /* __OUTLINER_INTERN_H__ */ diff --git a/source/blender/editors/space_script/script_intern.h b/source/blender/editors/space_script/script_intern.h index c6f72784b05..5d73bca350c 100644 --- a/source/blender/editors/space_script/script_intern.h +++ b/source/blender/editors/space_script/script_intern.h @@ -21,8 +21,7 @@ * \ingroup spscript */ -#ifndef __SCRIPT_INTERN_H__ -#define __SCRIPT_INTERN_H__ +#pragma once /* internal exports only */ @@ -33,5 +32,3 @@ void script_keymap(struct wmKeyConfig *keyconf); /* script_edit.c */ void SCRIPT_OT_reload(struct wmOperatorType *ot); void SCRIPT_OT_python_file_run(struct wmOperatorType *ot); - -#endif /* __SCRIPT_INTERN_H__ */ diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index fee07e8941d..1d168866e7c 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -21,8 +21,7 @@ * \ingroup spseq */ -#ifndef __SEQUENCER_INTERN_H__ -#define __SEQUENCER_INTERN_H__ +#pragma once #include "DNA_sequence_types.h" #include "RNA_access.h" @@ -208,5 +207,3 @@ int sequencer_image_seq_get_minmax_frame(struct wmOperator *op, int *r_numdigits); void sequencer_image_seq_reserve_frames( struct wmOperator *op, struct StripElem *se, int len, int minframe, int numdigits); - -#endif /* __SEQUENCER_INTERN_H__ */ diff --git a/source/blender/editors/space_text/text_format.h b/source/blender/editors/space_text/text_format.h index 07635e4227a..bb9574ee55e 100644 --- a/source/blender/editors/space_text/text_format.h +++ b/source/blender/editors/space_text/text_format.h @@ -21,8 +21,7 @@ * \ingroup sptext */ -#ifndef __TEXT_FORMAT_H__ -#define __TEXT_FORMAT_H__ +#pragma once /* *** Flatten String *** */ typedef struct FlattenString { @@ -110,5 +109,3 @@ void ED_text_format_register_pov_ini(void); #define STR_LITERAL_STARTSWITH(str, str_literal, len_var) \ (strncmp(str, str_literal, len_var = (sizeof(str_literal) - 1)) == 0) - -#endif /* __TEXT_FORMAT_H__ */ diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index d6588dda797..abafad4c241 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -21,8 +21,7 @@ * \ingroup sptext */ -#ifndef __TEXT_INTERN_H__ -#define __TEXT_INTERN_H__ +#pragma once /* internal exports only */ @@ -181,5 +180,3 @@ void TEXT_OT_autocomplete(struct wmOperatorType *ot); /* space_text.c */ extern const char *text_context_dir[]; /* doc access */ - -#endif /* __TEXT_INTERN_H__ */ diff --git a/source/blender/editors/space_userpref/userpref_intern.h b/source/blender/editors/space_userpref/userpref_intern.h index 56930d3a231..506e93ae7ac 100644 --- a/source/blender/editors/space_userpref/userpref_intern.h +++ b/source/blender/editors/space_userpref/userpref_intern.h @@ -21,9 +21,6 @@ * \ingroup spuserpref */ -#ifndef __USERPREF_INTERN_H__ -#define __USERPREF_INTERN_H__ +#pragma once /* internal exports only */ - -#endif /* __USERPREF_INTERN_H__ */ diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 50cd71d7edc..83707ca4383 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -21,8 +21,7 @@ * \ingroup spview3d */ -#ifndef __VIEW3D_INTERN_H__ -#define __VIEW3D_INTERN_H__ +#pragma once #include "ED_view3d.h" @@ -284,5 +283,3 @@ void VIEW3D_GGT_placement(struct wmGizmoGroupType *gzgt); extern uchar view3d_camera_border_hack_col[3]; extern bool view3d_camera_border_hack_test; #endif - -#endif /* __VIEW3D_INTERN_H__ */ diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index bbd18b4bdaf..1917d9463f4 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -21,8 +21,7 @@ * \ingroup edtransform */ -#ifndef __TRANSFORM_H__ -#define __TRANSFORM_H__ +#pragma once #include "ED_numinput.h" #include "ED_transform.h" @@ -753,5 +752,3 @@ bool checkUseAxisMatrix(TransInfo *t); *tc_end = (t)->data_container + (t)->data_container_len; \ th != tc_end; \ th++, i++) - -#endif diff --git a/source/blender/editors/transform/transform_constraints.h b/source/blender/editors/transform/transform_constraints.h index 282060af2c3..4c901842964 100644 --- a/source/blender/editors/transform/transform_constraints.h +++ b/source/blender/editors/transform/transform_constraints.h @@ -21,8 +21,7 @@ * \ingroup edtransform */ -#ifndef __TRANSFORM_CONSTRAINTS_H__ -#define __TRANSFORM_CONSTRAINTS_H__ +#pragma once struct TransInfo; @@ -49,5 +48,3 @@ int constraintModeToIndex(const TransInfo *t); char constraintModeToChar(const TransInfo *t); bool isLockConstraint(TransInfo *t); int getConstraintSpaceDimension(TransInfo *t); - -#endif diff --git a/source/blender/editors/transform/transform_convert.h b/source/blender/editors/transform/transform_convert.h index 70017d5560b..b753572ea7b 100644 --- a/source/blender/editors/transform/transform_convert.h +++ b/source/blender/editors/transform/transform_convert.h @@ -22,8 +22,7 @@ * \brief conversion and adaptation of different datablocks to a common struct. */ -#ifndef __TRANSFORM_CONVERT_H__ -#define __TRANSFORM_CONVERT_H__ +#pragma once struct BezTriple; struct FCurve; @@ -189,4 +188,3 @@ void special_aftertrans_update__sequencer(bContext *C, TransInfo *t); void createTransTrackingData(bContext *C, TransInfo *t); void recalcData_tracking(TransInfo *t); void special_aftertrans_update__movieclip(bContext *C, TransInfo *t); -#endif diff --git a/source/blender/editors/transform/transform_data.h b/source/blender/editors/transform/transform_data.h index 48ed9ecf34b..bca6a99e35a 100644 --- a/source/blender/editors/transform/transform_data.h +++ b/source/blender/editors/transform/transform_data.h @@ -21,8 +21,7 @@ * \ingroup edtransform */ -#ifndef __TRANSFORM_DATA_H__ -#define __TRANSFORM_DATA_H__ +#pragma once struct bConstraint; struct Object; @@ -193,5 +192,3 @@ enum { /* Hard min/max for proportional size. */ #define T_PROP_SIZE_MIN 1e-6f #define T_PROP_SIZE_MAX 1e12f - -#endif diff --git a/source/blender/editors/transform/transform_draw_cursors.h b/source/blender/editors/transform/transform_draw_cursors.h index e7696bad5a7..0f626c9039b 100644 --- a/source/blender/editors/transform/transform_draw_cursors.h +++ b/source/blender/editors/transform/transform_draw_cursors.h @@ -21,11 +21,8 @@ * \ingroup edtransform */ -#ifndef __TRANSFORM_DRAW_CURSORS_H__ -#define __TRANSFORM_DRAW_CURSORS_H__ +#pragma once /* Callbacks for #WM_paint_cursor_activate */ bool transform_draw_cursor_poll(struct bContext *C); void transform_draw_cursor_draw(struct bContext *C, int x, int y, void *customdata); - -#endif /* __TRANSFORM_DRAW_CURSORS_H__ */ diff --git a/source/blender/editors/transform/transform_mode.h b/source/blender/editors/transform/transform_mode.h index 5cda8e3063a..51aca7d551c 100644 --- a/source/blender/editors/transform/transform_mode.h +++ b/source/blender/editors/transform/transform_mode.h @@ -22,8 +22,7 @@ * \brief transform modes used by different operators. */ -#ifndef __TRANSFORM_MODE_H__ -#define __TRANSFORM_MODE_H__ +#pragma once struct AnimData; struct bContext; @@ -156,4 +155,3 @@ void initTranslation(TransInfo *t); void drawVertSlide(TransInfo *t); void initVertSlide_ex(TransInfo *t, bool use_even, bool flipped, bool use_clamp); void initVertSlide(TransInfo *t); -#endif diff --git a/source/blender/editors/transform/transform_snap.h b/source/blender/editors/transform/transform_snap.h index 688661bc2cb..b97a9dc882c 100644 --- a/source/blender/editors/transform/transform_snap.h +++ b/source/blender/editors/transform/transform_snap.h @@ -18,8 +18,7 @@ * \ingroup editors */ -#ifndef __TRANSFORM_SNAP_H__ -#define __TRANSFORM_SNAP_H__ +#pragma once #define SNAP_MIN_DISTANCE 30 @@ -88,5 +87,3 @@ eRedrawFlag updateSelectedSnapPoint(TransInfo *t); void removeSnapPoint(TransInfo *t); float transform_snap_distance_len_squared_fn(TransInfo *t, const float p1[3], const float p2[3]); - -#endif /* __TRANSFORM_SNAP_H__ */ diff --git a/source/blender/editors/undo/undo_intern.h b/source/blender/editors/undo/undo_intern.h index 8184e7bfbdc..660f1a5b57d 100644 --- a/source/blender/editors/undo/undo_intern.h +++ b/source/blender/editors/undo/undo_intern.h @@ -18,8 +18,7 @@ * \ingroup edundo */ -#ifndef __UNDO_INTERN_H__ -#define __UNDO_INTERN_H__ +#pragma once /* internal exports only */ @@ -27,5 +26,3 @@ struct UndoType; /* memfile_undo.c */ void ED_memfile_undosys_type(struct UndoType *ut); - -#endif /* __UNDO_INTERN_H__ */ diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index 5ccc6e29026..7455004ccb8 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -21,8 +21,7 @@ * \ingroup eduv */ -#ifndef __UVEDIT_INTERN_H__ -#define __UVEDIT_INTERN_H__ +#pragma once struct BMFace; struct BMLoop; @@ -147,5 +146,3 @@ void UV_OT_select_circle(struct wmOperatorType *ot); void UV_OT_select_more(struct wmOperatorType *ot); void UV_OT_select_less(struct wmOperatorType *ot); void UV_OT_select_overlap(struct wmOperatorType *ot); - -#endif /* __UVEDIT_INTERN_H__ */ diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h index 53188ea42bb..ee1eb4f63bf 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.h +++ b/source/blender/editors/uvedit/uvedit_parametrizer.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __UVEDIT_PARAMETRIZER_H__ -#define __UVEDIT_PARAMETRIZER_H__ +#pragma once /** \file * \ingroup eduv @@ -109,5 +108,3 @@ void param_flush_restore(ParamHandle *handle); #ifdef __cplusplus } #endif - -#endif /*__UVEDIT_PARAMETRIZER_H__*/ |