diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-12-15 15:01:45 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-12-15 15:01:45 +0300 |
| commit | 34a8cbbd2822dfeff37b8c00256f834db442babe (patch) | |
| tree | 33edb3a40cf2195c543821945baa450c938d9837 /source/blender/io/alembic | |
| parent | 13041570bfbf5f682a13421b22272e339ce8d2d7 (diff) | |
| parent | d8db5cb6003c84594f5c2f6a85a02f60bafe72c1 (diff) | |
Merge branch 'master' into cycles_procedural_api
Diffstat (limited to 'source/blender/io/alembic')
| -rw-r--r-- | source/blender/io/alembic/exporter/abc_writer_hair.cc | 1 | ||||
| -rw-r--r-- | source/blender/io/alembic/intern/alembic_capi.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/io/alembic/exporter/abc_writer_hair.cc b/source/blender/io/alembic/exporter/abc_writer_hair.cc index f8d610a3659..80f2cadd08c 100644 --- a/source/blender/io/alembic/exporter/abc_writer_hair.cc +++ b/source/blender/io/alembic/exporter/abc_writer_hair.cc @@ -30,6 +30,7 @@ #include "BLI_math_geom.h" +#include "BKE_customdata.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_particle.h" diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index a0003b2d28e..ce19683a363 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -35,6 +35,7 @@ #include "MEM_guardedalloc.h" #include "DNA_cachefile_types.h" +#include "DNA_collection_types.h" #include "DNA_curve_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" |