diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
| commit | 7283e6fb73490ddd23425ba2cf06cda7ac8f9458 (patch) | |
| tree | 7c0c7069a44743b7462d3ed271bedeb09300ec4f /source/blender/editors/gizmo_library | |
| parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
| parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/editors/gizmo_library')
| -rw-r--r-- | source/blender/editors/gizmo_library/gizmo_geometry.h | 5 | ||||
| -rw-r--r-- | source/blender/editors/gizmo_library/gizmo_library_intern.h | 5 |
2 files changed, 2 insertions, 8 deletions
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__ */ |