diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-11-19 19:38:48 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-11-19 19:38:48 +0300 |
| commit | bb960c85a55b823ee2c76911992043ac8c4eedda (patch) | |
| tree | c3238b01838796fd128f122cae376fe5335f485c /source/blender/makesdna/DNA_effect_types.h | |
| parent | eb25446b9d2df9ca1cde808b12105be502adc4d1 (diff) | |
| parent | 72a199e148b20c36a63cdf6c6af067c9bcdb3f92 (diff) | |
Merge branch 'master' into geometry-nodes
Diffstat (limited to 'source/blender/makesdna/DNA_effect_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_effect_types.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h index c25e9d0dded..33f2e1b47c0 100644 --- a/source/blender/makesdna/DNA_effect_types.h +++ b/source/blender/makesdna/DNA_effect_types.h @@ -23,6 +23,10 @@ #pragma once +#ifdef __cplusplus +extern "C" { +#endif + /* don't forget, new effects also in writefile.c for dna!!! */ #define PAF_MAXMULT 4 @@ -129,3 +133,7 @@ typedef struct WaveEff { float timeoffs, lifetime; } WaveEff; + +#ifdef __cplusplus +} +#endif |