diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-28 17:32:30 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-28 17:33:43 +0300 |
commit | b274d18aec525621bcb0a2234fc65e09398616c2 (patch) | |
tree | ec4310013623197f5bac2eb51c200503d898bd06 /source/blender/render | |
parent | 9c1da81a4c173437c1e556afde7b32eef4b0a47d (diff) |
Cleanup: correct usage of extern-C blocks in various places
This removes extern-C blocks around other includes and adds
such blocks for some headers that need them.
Diffstat (limited to 'source/blender/render')
10 files changed, 80 insertions, 0 deletions
diff --git a/source/blender/render/extern/include/RE_bake.h b/source/blender/render/extern/include/RE_bake.h index 3bab9179f84..6bb241b83ed 100644 --- a/source/blender/render/extern/include/RE_bake.h +++ b/source/blender/render/extern/include/RE_bake.h @@ -29,6 +29,10 @@ struct ImBuf; struct Mesh; struct Render; +#ifdef __cplusplus +extern "C" { +#endif + typedef struct BakeImage { struct Image *image; int width; @@ -120,4 +124,8 @@ void RE_bake_normal_world_to_world(const BakePixel pixel_array[], 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 51eb290b0b8..49d312923e7 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -48,6 +48,10 @@ struct ViewLayer; struct bNode; struct bNodeTree; +#ifdef __cplusplus +extern "C" { +#endif + /* External Engine */ /* RenderEngineType.flag */ @@ -237,4 +241,8 @@ void RE_bake_engine_set_engine_parameters(struct Render *re, 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 6abd9be6608..7698ff7d59c 100644 --- a/source/blender/render/extern/include/RE_multires_bake.h +++ b/source/blender/render/extern/include/RE_multires_bake.h @@ -27,6 +27,10 @@ struct MultiresBakeRender; struct Scene; +#ifdef __cplusplus +extern "C" { +#endif + typedef struct MultiresBakeRender { Scene *scene; DerivedMesh *lores_dm, *hires_dm; @@ -63,4 +67,8 @@ typedef struct MultiresBakeRender { void RE_multires_bake_images(struct MultiresBakeRender *bkr); +#ifdef __cplusplus +} +#endif + #endif diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index bdf81354b8d..7dfba8f668f 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -32,6 +32,10 @@ struct Depsgraph; struct ImagePool; struct MTex; +#ifdef __cplusplus +extern "C" { +#endif + /* render_texture.c */ bool RE_texture_evaluate(const struct MTex *mtex, const float vec[3], @@ -72,4 +76,8 @@ void RE_point_density_free(struct PointDensity *pd); void RE_point_density_fix_linking(void); +#ifdef __cplusplus +} +#endif + #endif /* __RE_RENDER_EXT_H__ */ diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h index 99282a8e703..ae78ac1dc1b 100644 --- a/source/blender/render/intern/include/initrender.h +++ b/source/blender/render/intern/include/initrender.h @@ -24,10 +24,18 @@ #ifndef __INITRENDER_H__ #define __INITRENDER_H__ +#ifdef __cplusplus +extern "C" { +#endif + /* Functions */ void RE_parts_init(Render *re); void RE_parts_free(Render *re); 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 0ed8871b224..70b358ec5b4 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -44,6 +44,10 @@ struct RenderResult; struct Scene; struct rcti; +#ifdef __cplusplus +extern "C" { +#endif + /* New */ struct RenderResult *render_result_new(struct Render *re, @@ -148,4 +152,8 @@ bool render_result_has_views(struct RenderResult *rr); } \ ((void)0) +#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 3ae4b9c0b90..14893c9bd1a 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -43,6 +43,10 @@ struct Object; struct RenderEngine; struct ReportList; +#ifdef __cplusplus +extern "C" { +#endif + /* this is handed over to threaded hiding/passes/shading engine */ typedef struct RenderPart { struct RenderPart *next, *prev; @@ -160,4 +164,8 @@ struct Render { /* R.flag */ #define R_ANIMATION 1 +#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 12b231ef55f..3e8864fe56d 100644 --- a/source/blender/render/intern/include/renderpipeline.h +++ b/source/blender/render/intern/include/renderpipeline.h @@ -30,10 +30,18 @@ struct RenderData; struct RenderLayer; struct RenderResult; +#ifdef __cplusplus +extern "C" { +#endif + struct RenderLayer *render_get_active_layer(struct Render *re, struct RenderResult *rr); void render_update_anim_renderdata(struct Render *re, struct RenderData *rd, struct ListBase *render_layers); 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 f051d3ed318..1c66cb3f04d 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -24,6 +24,10 @@ #ifndef __TEXTURE_H__ #define __TEXTURE_H__ +#ifdef __cplusplus +extern "C" { +#endif + #define BRICONT \ texres->tin = (texres->tin - 0.5f) * tex->contrast + tex->bright - 0.5f; \ if (!(tex->flag & TEX_NO_CLAMP)) { \ @@ -95,4 +99,8 @@ void image_sample(struct Image *ima, float result[4], struct ImagePool *pool); +#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 bc6addd6c5f..d03f997c8f2 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -21,6 +21,10 @@ #ifndef __ZBUF_H__ #define __ZBUF_H__ +#ifdef __cplusplus +extern "C" { +#endif + /* span fill in method, is also used to localize data for zbuffering */ typedef struct ZSpan { int rectx, recty; /* range for clipping */ @@ -40,4 +44,8 @@ void zspan_scanconvert(struct ZSpan *zpan, float *v3, void (*func)(void *, int, int, float, float)); +#ifdef __cplusplus +} +#endif + #endif |