diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 17:27:44 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 17:38:55 +0300 |
| commit | 405980b1facff4a76e3661a412eab1d072d0236f (patch) | |
| tree | 5ae5b79ac5bb91c2dc8d732531e7db4e67abee45 /source/blender/alembic/CMakeLists.txt | |
| parent | 7530c54c3cf38016d9038e6879c8ee2b1bd14c9e (diff) | |
| parent | 89eb05a8908130f8668e4c677d63f3d2b89e68bb (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc
# source/blender/alembic/intern/abc_exporter.h
# source/blender/alembic/intern/alembic_capi.cc
# tests/gtests/alembic/abc_export_test.cc
Diffstat (limited to 'source/blender/alembic/CMakeLists.txt')
| -rw-r--r-- | source/blender/alembic/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/alembic/CMakeLists.txt b/source/blender/alembic/CMakeLists.txt index aa12b726d6b..d3b5e189292 100644 --- a/source/blender/alembic/CMakeLists.txt +++ b/source/blender/alembic/CMakeLists.txt @@ -52,6 +52,7 @@ set(SRC intern/abc_curves.cc intern/abc_exporter.cc intern/abc_hair.cc + intern/abc_mball.cc intern/abc_mesh.cc intern/abc_nurbs.cc intern/abc_object.cc @@ -67,6 +68,7 @@ set(SRC intern/abc_curves.h intern/abc_exporter.h intern/abc_hair.h + intern/abc_mball.h intern/abc_mesh.h intern/abc_nurbs.h intern/abc_object.h |