From 91694b9b58ab953f3b313be9389cc1303e472fc2 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 7 Aug 2020 09:50:34 +0200 Subject: Code Style: use "#pragma once" in source directory This replaces header include guards with `#pragma once`. A couple of include guards are not removed yet (e.g. `__RNA_TYPES_H__`), because they are used in other places. This patch has been generated by P1561 followed by `make format`. Differential Revision: https://developer.blender.org/D8466 --- source/blender/render/extern/include/RE_bake.h | 5 +---- source/blender/render/extern/include/RE_engine.h | 5 +---- source/blender/render/extern/include/RE_multires_bake.h | 5 +---- source/blender/render/extern/include/RE_pipeline.h | 5 +---- source/blender/render/extern/include/RE_render_ext.h | 5 +---- source/blender/render/extern/include/RE_shader_ext.h | 5 +---- source/blender/render/intern/include/initrender.h | 5 +---- source/blender/render/intern/include/render_result.h | 5 +---- source/blender/render/intern/include/render_types.h | 5 +---- source/blender/render/intern/include/renderpipeline.h | 5 +---- source/blender/render/intern/include/texture.h | 5 +---- source/blender/render/intern/include/zbuf.h | 5 +---- 12 files changed, 12 insertions(+), 48 deletions(-) (limited to 'source/blender/render') diff --git a/source/blender/render/extern/include/RE_bake.h b/source/blender/render/extern/include/RE_bake.h index 6bb241b83ed..3ed41ede006 100644 --- a/source/blender/render/extern/include/RE_bake.h +++ b/source/blender/render/extern/include/RE_bake.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __RE_BAKE_H__ -#define __RE_BAKE_H__ +#pragma once struct Depsgraph; struct ImBuf; @@ -127,5 +126,3 @@ void RE_bake_ibuf_clear(struct Image *image, const bool is_tangent); #ifdef __cplusplus } #endif - -#endif /* __RE_BAKE_H__ */ diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 49d312923e7..41f65fbda5c 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __RE_ENGINE_H__ -#define __RE_ENGINE_H__ +#pragma once #include "DNA_listBase.h" #include "DNA_node_types.h" @@ -244,5 +243,3 @@ void RE_engine_free_blender_memory(struct RenderEngine *engine); #ifdef __cplusplus } #endif - -#endif /* __RE_ENGINE_H__ */ diff --git a/source/blender/render/extern/include/RE_multires_bake.h b/source/blender/render/extern/include/RE_multires_bake.h index 7698ff7d59c..c48ce7bfd6e 100644 --- a/source/blender/render/extern/include/RE_multires_bake.h +++ b/source/blender/render/extern/include/RE_multires_bake.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __RE_MULTIRES_BAKE_H__ -#define __RE_MULTIRES_BAKE_H__ +#pragma once struct MultiresBakeRender; struct Scene; @@ -70,5 +69,3 @@ void RE_multires_bake_images(struct MultiresBakeRender *bkr); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 45b5362d40b..c8cb537af39 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __RE_PIPELINE_H__ -#define __RE_PIPELINE_H__ +#pragma once #include "DEG_depsgraph.h" #include "DNA_listBase.h" @@ -392,5 +391,3 @@ RenderResult *RE_DuplicateRenderResult(RenderResult *rr); #ifdef __cplusplus } #endif - -#endif /* __RE_PIPELINE_H__ */ diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index 7dfba8f668f..76812840c91 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -20,8 +20,7 @@ * \ingroup render */ -#ifndef __RE_RENDER_EXT_H__ -#define __RE_RENDER_EXT_H__ +#pragma once /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* this include is for non-render pipeline exports (still old cruft here) */ @@ -79,5 +78,3 @@ void RE_point_density_fix_linking(void); #ifdef __cplusplus } #endif - -#endif /* __RE_RENDER_EXT_H__ */ diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index f69ae4dfd5c..dc41afee938 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -20,8 +20,7 @@ * \ingroup render */ -#ifndef __RE_SHADER_EXT_H__ -#define __RE_SHADER_EXT_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -82,5 +81,3 @@ int multitex_nodes(struct Tex *tex, #ifdef __cplusplus } #endif - -#endif /* __RE_SHADER_EXT_H__ */ diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h index ae78ac1dc1b..f5ac352752f 100644 --- a/source/blender/render/intern/include/initrender.h +++ b/source/blender/render/intern/include/initrender.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __INITRENDER_H__ -#define __INITRENDER_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -37,5 +36,3 @@ void RE_parts_clamp(Render *re); #ifdef __cplusplus } #endif - -#endif /* __INITRENDER_H__ */ diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index 70b358ec5b4..187685cd464 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __RENDER_RESULT_H__ -#define __RENDER_RESULT_H__ +#pragma once #define PASS_VECTOR_MAX 10000.0f @@ -155,5 +154,3 @@ bool render_result_has_views(struct RenderResult *rr); #ifdef __cplusplus } #endif - -#endif /* __RENDER_RESULT_H__ */ diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 14893c9bd1a..6be5fb4792c 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __RENDER_TYPES_H__ -#define __RENDER_TYPES_H__ +#pragma once /* ------------------------------------------------------------------------- */ /* exposed internal in render module only! */ @@ -167,5 +166,3 @@ struct Render { #ifdef __cplusplus } #endif - -#endif /* __RENDER_TYPES_H__ */ diff --git a/source/blender/render/intern/include/renderpipeline.h b/source/blender/render/intern/include/renderpipeline.h index 3e8864fe56d..062df59bfd3 100644 --- a/source/blender/render/intern/include/renderpipeline.h +++ b/source/blender/render/intern/include/renderpipeline.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __RENDERPIPELINE_H__ -#define __RENDERPIPELINE_H__ +#pragma once struct ListBase; struct Render; @@ -43,5 +42,3 @@ void render_copy_renderdata(struct RenderData *to, struct RenderData *from); #ifdef __cplusplus } #endif - -#endif /* __RENDERPIPELINE_H__ */ diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index 1c66cb3f04d..22023baab95 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __TEXTURE_H__ -#define __TEXTURE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -102,5 +101,3 @@ void image_sample(struct Image *ima, #ifdef __cplusplus } #endif - -#endif /* __TEXTURE_H__ */ diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h index d03f997c8f2..b898ff89ae4 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -18,8 +18,7 @@ * \ingroup render */ -#ifndef __ZBUF_H__ -#define __ZBUF_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -47,5 +46,3 @@ void zspan_scanconvert(struct ZSpan *zpan, #ifdef __cplusplus } #endif - -#endif -- cgit v1.2.3