diff options
| author | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
| commit | 0d2d4a6d4a75ac38c41f872c88255eab70e88ab7 (patch) | |
| tree | b7a7518af86dddba48e05a98b3c2be55e8804721 /source/blender/render/intern/include/render_result.h | |
| parent | 9b416c66fb714bdfd15a481489dbf650d0f389ea (diff) | |
| parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) | |
Merge branch 'master' into temp-ui-button-type-refactortemp-ui-button-type-refactor
Diffstat (limited to 'source/blender/render/intern/include/render_result.h')
| -rw-r--r-- | source/blender/render/intern/include/render_result.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index 0ed8871b224..187685cd464 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -21,8 +21,7 @@ * \ingroup render */ -#ifndef __RENDER_RESULT_H__ -#define __RENDER_RESULT_H__ +#pragma once #define PASS_VECTOR_MAX 10000.0f @@ -44,6 +43,10 @@ struct RenderResult; struct Scene; struct rcti; +#ifdef __cplusplus +extern "C" { +#endif + /* New */ struct RenderResult *render_result_new(struct Render *re, @@ -148,4 +151,6 @@ bool render_result_has_views(struct RenderResult *rr); } \ ((void)0) -#endif /* __RENDER_RESULT_H__ */ +#ifdef __cplusplus +} +#endif |