diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:43:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:43:52 +0300 |
| commit | 496b510438b2f994cafcec6e36fe300be9fe015f (patch) | |
| tree | 426f0e61c752535d2231459bcd2152c95c681e55 /source/blender/alembic/intern/abc_mesh.h | |
| parent | c116bb0c7fdae35fbb062260cc9581eb3b4f36cf (diff) | |
| parent | 33ab011ae4928cbbb49115abf653d91b8f3ba4d2 (diff) | |
Merge branch 'master' into id_copy_refactorid_copy_refactor
Conflicts:
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_sequencer/sequencer_edit.c
Diffstat (limited to 'source/blender/alembic/intern/abc_mesh.h')
| -rw-r--r-- | source/blender/alembic/intern/abc_mesh.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h index 6bf1dde3d1d..5c1eb01d8e0 100644 --- a/source/blender/alembic/intern/abc_mesh.h +++ b/source/blender/alembic/intern/abc_mesh.h @@ -112,6 +112,11 @@ public: private: void readFaceSetsSample(Main *bmain, Mesh *mesh, size_t poly_start, const Alembic::AbcGeom::ISampleSelector &sample_sel); + + void assign_facesets_to_mpoly(const Alembic::Abc::ISampleSelector &sample_sel, + size_t poly_start, + MPoly *mpoly, int totpoly, + std::map<std::string, int> & r_mat_map); }; /* ************************************************************************** */ |