Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-01-28 13:08:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-28 13:17:58 +0300
commitc0f88ed8a860026e32ec6a06287fcf9394b4cf0a (patch)
tree65a06f6b9b22c85a80f2d64069d36f435eeb97aa /source/blender/render
parentd473d5be5f59ed2cdd8e7b08feabcf7d9b8a8b5b (diff)
Cleanup: sort forward declarations of enum & struct
Done using: source/tools/utils_maintenance/c_sort_blocks.py
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/extern/include/RE_bake.h4
-rw-r--r--source/blender/render/extern/include/RE_engine.h4
-rw-r--r--source/blender/render/extern/include/RE_pipeline.h6
-rw-r--r--source/blender/render/extern/include/RE_render_ext.h2
-rw-r--r--source/blender/render/extern/include/RE_shader_ext.h4
-rw-r--r--source/blender/render/intern/include/render_result.h4
-rw-r--r--source/blender/render/intern/include/render_types.h2
-rw-r--r--source/blender/render/intern/include/texture.h6
8 files changed, 16 insertions, 16 deletions
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,
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h
index 707b1f6e2a6..9fd3deb1d3e 100644
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/include/render_result.h
@@ -40,6 +40,8 @@
#define RR_ALL_LAYERS NULL
#define RR_ALL_VIEWS NULL
+struct ColorManagedDisplaySettings;
+struct ColorManagedViewSettings;
struct ImBuf;
struct ListBase;
struct Render;
@@ -49,8 +51,6 @@ struct RenderLayer;
struct RenderResult;
struct Scene;
struct rcti;
-struct ColorManagedDisplaySettings;
-struct ColorManagedViewSettings;
/* New */
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index e5689dfff74..dd268b5e119 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -44,10 +44,10 @@
#include "RE_pipeline.h"
+struct Main;
struct Object;
struct RenderEngine;
struct ReportList;
-struct Main;
/* this is handed over to threaded hiding/passes/shading engine */
typedef struct RenderPart {
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index 04a456c0850..85061e4cedc 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -63,11 +63,11 @@
} \
} \
-struct TexResult;
-struct Tex;
-struct Image;
struct ImBuf;
+struct Image;
struct ImagePool;
+struct Tex;
+struct TexResult;
/* imagetexture.h */