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/extern/include | |
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/extern/include')
4 files changed, 32 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__ */ |