diff options
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/extern/include/RE_bake.h | 2 | ||||
-rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 6 | ||||
-rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 6 | ||||
-rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 6 | ||||
-rw-r--r-- | source/blender/render/intern/include/envmap.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/include/occlusion.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/include/render_result.h | 4 | ||||
-rw-r--r-- | source/blender/render/intern/include/render_types.h | 16 | ||||
-rw-r--r-- | source/blender/render/intern/include/rendercore.h | 6 | ||||
-rw-r--r-- | source/blender/render/intern/include/renderdatabase.h | 18 | ||||
-rw-r--r-- | source/blender/render/intern/include/shadbuf.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/include/shading.h | 14 | ||||
-rw-r--r-- | source/blender/render/intern/include/sss.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/include/strand.h | 16 | ||||
-rw-r--r-- | source/blender/render/intern/include/texture.h | 8 | ||||
-rw-r--r-- | source/blender/render/intern/include/zbuf.h | 10 |
16 files changed, 60 insertions, 60 deletions
diff --git a/source/blender/render/extern/include/RE_bake.h b/source/blender/render/extern/include/RE_bake.h index ad4d7485acc..1b53fba5967 100644 --- a/source/blender/render/extern/include/RE_bake.h +++ b/source/blender/render/extern/include/RE_bake.h @@ -33,8 +33,8 @@ #define __RE_BAKE_H__ struct ImBuf; -struct Render; struct Mesh; +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 e23d881c7b1..564a3e0eee7 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -39,8 +39,7 @@ #include "BLI_threads.h" -struct bNode; -struct bNodeTree; +struct BakePixel; struct Object; struct Render; struct RenderData; @@ -50,7 +49,8 @@ struct RenderLayer; struct RenderResult; struct ReportList; struct Scene; -struct BakePixel; +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 6e35f10b7c5..f9d5126e5f5 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -35,8 +35,7 @@ #include "DNA_listBase.h" #include "DNA_vec_types.h" -struct bMovieHandle; -struct bNodeTree; +struct EnvMap; struct Image; struct ImageFormatData; struct Main; @@ -47,8 +46,9 @@ struct RenderResult; struct ReportList; struct Scene; struct SceneRenderLayer; -struct EnvMap; struct StampData; +struct bMovieHandle; +struct bNodeTree; /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* this include is what is exposed of render to outside world */ diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 838f7031d14..cc577e57309 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -194,11 +194,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, @@ -222,8 +222,8 @@ void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta); /* shaded view and bake */ -struct Render; struct Image; +struct Render; int RE_bake_shade_all_selected(struct Render *re, int type, struct Object *actob, short *do_update, float *progress); struct Image *RE_bake_shade_get_image(void); diff --git a/source/blender/render/intern/include/envmap.h b/source/blender/render/intern/include/envmap.h index cf9efcb0beb..960b6f3632a 100644 --- a/source/blender/render/intern/include/envmap.h +++ b/source/blender/render/intern/include/envmap.h @@ -42,9 +42,9 @@ * (initrender.c) */ +struct ImagePool; struct Render; struct TexResult; -struct ImagePool; void make_envmaps(struct Render *re); int envmaptex(struct Tex *tex, const float texvec[3], float dxt[3], float dyt[3], int osatex, struct TexResult *texres, struct ImagePool *pool, const bool skip_image_load); diff --git a/source/blender/render/intern/include/occlusion.h b/source/blender/render/intern/include/occlusion.h index 15a5a04e3f6..0beaaea500d 100644 --- a/source/blender/render/intern/include/occlusion.h +++ b/source/blender/render/intern/include/occlusion.h @@ -34,8 +34,8 @@ #define __OCCLUSION_H__ struct Render; -struct ShadeInput; struct RenderPart; +struct ShadeInput; struct ShadeSample; void make_occ_tree(struct Render *re); diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index a164bc1f940..1669f5aa7b2 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 1978820856f..d93cdb0cdfb 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -53,18 +53,18 @@ #include "BLI_sys_types.h" // for intptr_t support struct EvaluationContext; -struct Object; -struct MemArena; -struct VertTableNode; -struct VlakTableNode; struct GHash; +struct ImagePool; +struct Main; +struct MemArena; +struct Object; struct ObjectInstanceRen; -struct RayObject; struct RayFace; +struct RayObject; struct RenderEngine; struct ReportList; -struct Main; -struct ImagePool; +struct VertTableNode; +struct VlakTableNode; #define TABLEINITSIZE 1024 @@ -407,8 +407,8 @@ struct halosort { }; /* ------------------------------------------------------------------------- */ -struct Material; struct ImagePool; +struct Material; typedef struct RadFace { float unshot[3], totrad[3]; diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h index aa3efca9e5b..509b2c1f5c5 100644 --- a/source/blender/render/intern/include/rendercore.h +++ b/source/blender/render/intern/include/rendercore.h @@ -40,12 +40,12 @@ #include "NOD_composite.h" +struct RayObject; +struct RenderLayer; +struct RenderPart; struct ShadeInput; struct ShadeResult; struct World; -struct RenderPart; -struct RenderLayer; -struct RayObject; /* ------------------------------------------------------------------------- */ diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h index 1840ec493c8..c4a99da10c3 100644 --- a/source/blender/render/intern/include/renderdatabase.h +++ b/source/blender/render/intern/include/renderdatabase.h @@ -37,21 +37,21 @@ extern "C" { #endif -struct Object; -struct VlakRen; -struct VertRen; +struct CustomData; struct HaloRen; +struct Isect; +struct MCol; +struct MTFace; struct Main; struct Material; +struct Object; +struct ObjectInstanceRen; +struct RadFace; struct Render; -struct MCol; -struct MTFace; -struct CustomData; struct StrandBuffer; struct StrandRen; -struct ObjectInstanceRen; -struct RadFace; -struct Isect; +struct VertRen; +struct VlakRen; #define RE_QUAD_MASK 0x7FFFFFF #define RE_QUAD_OFFS 0x8000000 diff --git a/source/blender/render/intern/include/shadbuf.h b/source/blender/render/intern/include/shadbuf.h index 5722f37a6a8..34b2988c7cc 100644 --- a/source/blender/render/intern/include/shadbuf.h +++ b/source/blender/render/intern/include/shadbuf.h @@ -64,8 +64,8 @@ float shadow_halo(LampRen *lar, const float p1[3], const float p2[3]); * Irregular shadowbuffer */ -struct MemArena; struct APixstr; +struct MemArena; void ISB_create(RenderPart *pa, struct APixstr *apixbuf); void ISB_free(RenderPart *pa); diff --git a/source/blender/render/intern/include/shading.h b/source/blender/render/intern/include/shading.h index e306c3c075c..b04cf792f28 100644 --- a/source/blender/render/intern/include/shading.h +++ b/source/blender/render/intern/include/shading.h @@ -26,16 +26,16 @@ */ +struct Isect; +struct LampRen; +struct ObjectInstanceRen; +struct PixStr; +struct RenderLayer; +struct RenderPart; struct ShadeInput; struct ShadeResult; -struct RenderPart; -struct RenderLayer; -struct PixStr; -struct LampRen; -struct VlakRen; struct StrandPoint; -struct ObjectInstanceRen; -struct Isect; +struct VlakRen; /* shadeinput.c */ diff --git a/source/blender/render/intern/include/sss.h b/source/blender/render/intern/include/sss.h index e01dfe73851..69e635286b6 100644 --- a/source/blender/render/intern/include/sss.h +++ b/source/blender/render/intern/include/sss.h @@ -53,8 +53,8 @@ void scatter_tree_free(ScatterTree *tree); /* Internal renderer API */ -struct Render; struct Material; +struct Render; void make_sss_tree(struct Render *re); void sss_add_points(Render *re, float (*co)[3], float (*color)[3], float *area, int totpoint); diff --git a/source/blender/render/intern/include/strand.h b/source/blender/render/intern/include/strand.h index 354ba3f0f07..9e6689b31f0 100644 --- a/source/blender/render/intern/include/strand.h +++ b/source/blender/render/intern/include/strand.h @@ -28,17 +28,17 @@ #ifndef __STRAND_H__ #define __STRAND_H__ -struct StrandVert; -struct StrandRen; -struct StrandBuffer; +struct DerivedMesh; +struct ObjectInstanceRen; +struct ObjectRen; +struct Render; struct ShadeSample; +struct StrandBuffer; struct StrandPart; -struct Render; -struct ZSpan; -struct ObjectInstanceRen; +struct StrandRen; struct StrandSurface; -struct DerivedMesh; -struct ObjectRen; +struct StrandVert; +struct ZSpan; typedef struct StrandPoint { /* position within segment */ diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index f6d39b81f2a..9b297c20950 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -64,12 +64,12 @@ } \ struct HaloRen; -struct ShadeInput; -struct TexResult; -struct Tex; -struct Image; struct ImBuf; +struct Image; struct ImagePool; +struct ShadeInput; +struct Tex; +struct TexResult; /* texture.h */ diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h index 50ad78b5be7..2b96ce1356e 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -33,14 +33,14 @@ #ifndef __ZBUF_H__ #define __ZBUF_H__ -struct RenderPart; -struct RenderLayer; +struct APixstr; +struct APixstrand; struct LampRen; struct ListBase; -struct ZSpan; -struct APixstrand; -struct APixstr; +struct RenderLayer; +struct RenderPart; struct StrandShadeCache; +struct ZSpan; void fillrect(int *rect, int x, int y, int val); |