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 | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/draw/engines')
13 files changed, 13 insertions, 52 deletions
diff --git a/source/blender/draw/engines/basic/basic_engine.h b/source/blender/draw/engines/basic/basic_engine.h index d17f1c24c37..8ace6f23cdc 100644 --- a/source/blender/draw/engines/basic/basic_engine.h +++ b/source/blender/draw/engines/basic/basic_engine.h @@ -20,9 +20,6 @@ * \ingroup draw_engine */ -#ifndef __BASIC_ENGINE_H__ -#define __BASIC_ENGINE_H__ +#pragma once extern DrawEngineType draw_engine_basic_type; - -#endif /* __BASIC_ENGINE_H__ */ diff --git a/source/blender/draw/engines/eevee/eevee_engine.h b/source/blender/draw/engines/eevee/eevee_engine.h index b27d16aa7d8..40784e2980b 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.h +++ b/source/blender/draw/engines/eevee/eevee_engine.h @@ -20,9 +20,6 @@ * \ingroup DNA */ -#ifndef __EEVEE_ENGINE_H__ -#define __EEVEE_ENGINE_H__ +#pragma once extern RenderEngineType DRW_engine_viewport_eevee_type; - -#endif /* __EEVEE_ENGINE_H__ */ diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.h b/source/blender/draw/engines/eevee/eevee_lightcache.h index 0db36ce0c2e..834f0fc8a45 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.h +++ b/source/blender/draw/engines/eevee/eevee_lightcache.h @@ -20,8 +20,7 @@ * \ingroup eevee */ -#ifndef __EEVEE_LIGHTCACHE_H__ -#define __EEVEE_LIGHTCACHE_H__ +#pragma once #include "BLI_sys_types.h" /* for bool */ @@ -62,5 +61,3 @@ struct LightCache *EEVEE_lightcache_create(const int grid_len, void EEVEE_lightcache_free(struct LightCache *lcache); bool EEVEE_lightcache_load(struct LightCache *lcache); void EEVEE_lightcache_info_update(struct SceneEEVEE *eevee); - -#endif /* __EEVEE_LIGHTCACHE_H__ */ diff --git a/source/blender/draw/engines/eevee/eevee_lut.h b/source/blender/draw/engines/eevee/eevee_lut.h index 04049efd758..d5dbf8ce690 100644 --- a/source/blender/draw/engines/eevee/eevee_lut.h +++ b/source/blender/draw/engines/eevee/eevee_lut.h @@ -21,8 +21,7 @@ * \ingroup gpu */ -#ifndef __EEVEE_LUT_H__ -#define __EEVEE_LUT_H__ +#pragma once extern const float ltc_mat_ggx[64 * 64 * 4]; extern const float ltc_mag_ggx[64 * 64 * 2]; @@ -30,5 +29,3 @@ extern const float bsdf_split_sum_ggx[64 * 64 * 2]; extern const float ltc_disk_integral[64 * 64]; extern const float btdf_split_sum_ggx[32][64 * 64]; extern const float blue_noise[64 * 64][4]; - -#endif /* __EEVEE_LUT_H__ */ diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 9e737de1767..34cd22ad13c 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -20,8 +20,7 @@ * \ingroup DNA */ -#ifndef __EEVEE_PRIVATE_H__ -#define __EEVEE_PRIVATE_H__ +#pragma once #include "DRW_render.h" @@ -1357,5 +1356,3 @@ static const float cubefacemat[6][4][4] = { {0.0f, 0.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}, }; - -#endif /* __EEVEE_PRIVATE_H__ */ diff --git a/source/blender/draw/engines/external/external_engine.h b/source/blender/draw/engines/external/external_engine.h index 01edea38ab0..c645fb99e0e 100644 --- a/source/blender/draw/engines/external/external_engine.h +++ b/source/blender/draw/engines/external/external_engine.h @@ -20,9 +20,6 @@ * \ingroup draw_engine */ -#ifndef __EXTERNAL_ENGINE_H__ -#define __EXTERNAL_ENGINE_H__ +#pragma once extern RenderEngineType DRW_engine_viewport_external_type; - -#endif /* __EXTERNAL_ENGINE_H__ */ diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h index 7baca28dca3..a406df530fc 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.h +++ b/source/blender/draw/engines/gpencil/gpencil_engine.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __GPENCIL_ENGINE_H__ -#define __GPENCIL_ENGINE_H__ +#pragma once #include "DNA_gpencil_types.h" @@ -439,5 +438,3 @@ void GPENCIL_render_to_image(void *vedata, void gpencil_light_pool_free(void *storage); void gpencil_material_pool_free(void *storage); GPENCIL_ViewLayerData *GPENCIL_view_layer_data_ensure(void); - -#endif /* __GPENCIL_ENGINE_H__ */ 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__ */ diff --git a/source/blender/draw/engines/select/select_engine.h b/source/blender/draw/engines/select/select_engine.h index 79139d9deaf..2b35cf6bee5 100644 --- a/source/blender/draw/engines/select/select_engine.h +++ b/source/blender/draw/engines/select/select_engine.h @@ -20,8 +20,7 @@ * \ingroup draw_engine */ -#ifndef __SELECT_ENGINE_H__ -#define __SELECT_ENGINE_H__ +#pragma once extern DrawEngineType draw_engine_select_type; extern RenderEngineType DRW_engine_viewport_select_type; @@ -30,5 +29,3 @@ struct SELECTID_Context *DRW_select_engine_context_get(void); struct GPUFrameBuffer *DRW_engine_select_framebuffer_get(void); struct GPUTexture *DRW_engine_select_texture_get(void); - -#endif /* __SELECT_ENGINE_H__ */ diff --git a/source/blender/draw/engines/select/select_private.h b/source/blender/draw/engines/select/select_private.h index 1e99a49252e..763d1a0897d 100644 --- a/source/blender/draw/engines/select/select_private.h +++ b/source/blender/draw/engines/select/select_private.h @@ -20,8 +20,7 @@ * \ingroup draw_engine */ -#ifndef __SELECT_PRIVATE_H__ -#define __SELECT_PRIVATE_H__ +#pragma once #define USE_CAGE_OCCLUSION @@ -78,5 +77,3 @@ void select_id_draw_object(void *vedata, uint *r_vert_offset, uint *r_edge_offset, uint *r_face_offset); - -#endif /* __SELECT_PRIVATE_H__ */ diff --git a/source/blender/draw/engines/workbench/workbench_engine.h b/source/blender/draw/engines/workbench/workbench_engine.h index eee53fcde07..8fd427c2683 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.h +++ b/source/blender/draw/engines/workbench/workbench_engine.h @@ -20,9 +20,6 @@ * \ingroup draw_engine */ -#ifndef __WORKBENCH_ENGINE_H__ -#define __WORKBENCH_ENGINE_H__ +#pragma once extern RenderEngineType DRW_engine_viewport_workbench_type; - -#endif /* __WORKBENCH_ENGINE_H__ */ diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index 244ac695e78..4a6dadc32fd 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -20,8 +20,7 @@ * \ingroup draw_engine */ -#ifndef __WORKBENCH_PRIVATE_H__ -#define __WORKBENCH_PRIVATE_H__ +#pragma once #include "BKE_studiolight.h" @@ -520,5 +519,3 @@ void workbench_render(void *ved, void workbench_render_update_passes(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer); - -#endif |