diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-05-26 12:57:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-26 12:57:28 +0300 |
commit | f2a8b74c2572258391c5847c177e59266aee3dab (patch) | |
tree | 0b3d7d1822beb32d335b0689bb04bb0a3a36f98c /source/blender/alembic/intern | |
parent | 3b24ece297afc8ee648f91dbbe890d8aaee7e3bc (diff) | |
parent | f78ba0df02a9734740d7ccddbe315020f56852f6 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic/intern')
-rw-r--r-- | source/blender/alembic/intern/abc_archive.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/alembic/intern/abc_archive.cc b/source/blender/alembic/intern/abc_archive.cc index ff14cf15124..bd16196cb78 100644 --- a/source/blender/alembic/intern/abc_archive.cc +++ b/source/blender/alembic/intern/abc_archive.cc @@ -23,8 +23,10 @@ */ #include "abc_archive.h" - -#include "BKE_blender_version.h" +extern "C" +{ + #include "BKE_blender_version.h" +} #ifdef WIN32 # include "utfconv.h" |