From c0f88ed8a860026e32ec6a06287fcf9394b4cf0a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 28 Jan 2019 21:08:24 +1100 Subject: Cleanup: sort forward declarations of enum & struct Done using: source/tools/utils_maintenance/c_sort_blocks.py --- source/blender/render/extern/include/RE_bake.h | 4 ++-- source/blender/render/extern/include/RE_engine.h | 4 ++-- source/blender/render/extern/include/RE_pipeline.h | 6 +++--- source/blender/render/extern/include/RE_render_ext.h | 2 +- source/blender/render/extern/include/RE_shader_ext.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/render/extern') diff --git a/source/blender/render/extern/include/RE_bake.h b/source/blender/render/extern/include/RE_bake.h index 4489efc6a10..f78f59613df 100644 --- a/source/blender/render/extern/include/RE_bake.h +++ b/source/blender/render/extern/include/RE_bake.h @@ -32,10 +32,10 @@ #ifndef __RE_BAKE_H__ #define __RE_BAKE_H__ +struct Depsgraph; struct ImBuf; -struct Render; struct Mesh; -struct Depsgraph; +struct Render; typedef struct BakeImage { struct Image *image; diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 8ce3cfe75f8..f78d9d6d828 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -39,8 +39,6 @@ #include "BLI_threads.h" -struct bNode; -struct bNodeTree; struct BakePixel; struct Depsgraph; struct IDProperty; @@ -55,6 +53,8 @@ struct RenderResult; struct ReportList; struct Scene; struct ViewLayer; +struct bNode; +struct bNodeTree; /* External Engine */ diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index bde767dc99e..5537efd4f75 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -36,8 +36,6 @@ #include "DNA_vec_types.h" #include "DEG_depsgraph.h" -struct bMovieHandle; -struct bNodeTree; struct Depsgraph; struct Image; struct ImageFormatData; @@ -48,8 +46,10 @@ struct RenderData; struct RenderResult; struct ReportList; struct Scene; -struct ViewLayer; struct StampData; +struct ViewLayer; +struct bMovieHandle; +struct bNodeTree; /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* this include is what is exposed of render to outside world */ diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index dad88cf06fa..f631a45025f 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -40,9 +40,9 @@ struct Depsgraph; struct ImagePool; struct MTex; +struct Render; struct Scene; struct ViewLayer; -struct Render; /* render_texture.c */ /* used by particle.c, effect.c, editmesh_modes.c and brush.c, returns 1 if rgb, 0 otherwise */ diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 52d4961352d..903fc5266bf 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -50,11 +50,11 @@ typedef struct BakeImBufuserData { } BakeImBufuserData; /* node shaders... */ -struct Tex; -struct MTex; struct ImBuf; struct ImagePool; +struct MTex; struct Object; +struct Tex; /* this one uses nodes */ int multitex_ext(struct Tex *tex, -- cgit v1.2.3