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/draw/engines/overlay | |
| parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
| parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/draw/engines/overlay')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_engine.h | 5 | ||||
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_private.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_engine.h b/source/blender/draw/engines/overlay/overlay_engine.h index 795e3805037..f9f6ee0511c 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.h +++ b/source/blender/draw/engines/overlay/overlay_engine.h @@ -20,9 +20,6 @@ * \ingroup draw_engine */ -#ifndef __OVERLAY_ENGINE_H__ -#define __OVERLAY_ENGINE_H__ +#pragma once extern DrawEngineType draw_engine_overlay_type; - -#endif /* __OVERLAY_ENGINE_H__ */ diff --git a/source/blender/draw/engines/overlay/overlay_private.h b/source/blender/draw/engines/overlay/overlay_private.h index efb9594f499..a8ac2616c02 100644 --- a/source/blender/draw/engines/overlay/overlay_private.h +++ b/source/blender/draw/engines/overlay/overlay_private.h @@ -20,8 +20,7 @@ * \ingroup DNA */ -#ifndef __OVERLAY_PRIVATE_H__ -#define __OVERLAY_PRIVATE_H__ +#pragma once #ifdef __APPLE__ # define USE_GEOM_SHADER_WORKAROUND 1 @@ -630,5 +629,3 @@ GPUShader *OVERLAY_shader_xray_fade(void); OVERLAY_InstanceFormats *OVERLAY_shader_instance_formats_get(void); void OVERLAY_shader_free(void); - -#endif /* __OVERLAY_PRIVATE_H__ */ |