diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-09-28 07:04:21 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-09-28 07:04:21 +0300 |
| commit | c4b7ffa6f50c9680059fd221b5d7391fae6e6f29 (patch) | |
| tree | 431834a347a5cab1347ff92eb7290a8cebe04079 /source/blender/blenkernel/BKE_mesh_legacy_convert.h | |
| parent | 0f36ad24b5031f78664a935a3c483751e173e308 (diff) | |
| parent | 788f3d72cf89c0301721a5eb2a72da07058dfa24 (diff) | |
Merge branch 'master' into refactor-mesh-position-generic
Diffstat (limited to 'source/blender/blenkernel/BKE_mesh_legacy_convert.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_mesh_legacy_convert.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_mesh_legacy_convert.h b/source/blender/blenkernel/BKE_mesh_legacy_convert.h index 1cc9523f5cf..b5bd9d17a22 100644 --- a/source/blender/blenkernel/BKE_mesh_legacy_convert.h +++ b/source/blender/blenkernel/BKE_mesh_legacy_convert.h @@ -11,7 +11,9 @@ #ifdef __cplusplus # include "BLI_resource_scope.hh" +# include "BLI_span.hh" # include "BLI_vector.hh" +# include "DNA_customdata_types.h" #endif #include "DNA_customdata_types.h" @@ -24,10 +26,13 @@ struct CustomData; struct Mesh; struct MFace; +#ifdef __cplusplus + /** * Move face sets to the legacy type from a generic type. */ -void BKE_mesh_legacy_face_set_from_generic(struct Mesh *mesh); +void BKE_mesh_legacy_face_set_from_generic( + Mesh *mesh, blender::MutableSpan<CustomDataLayer> poly_layers_to_write); /** * Copy face sets to the generic data type from the legacy type. */ @@ -81,15 +86,15 @@ void BKE_mesh_legacy_convert_material_indices_to_mpoly(struct Mesh *mesh); */ void BKE_mesh_legacy_convert_mpoly_to_material_indices(struct Mesh *mesh); -#ifdef __cplusplus struct MVert *BKE_mesh_legacy_convert_positions_to_verts( Mesh *mesh, blender::ResourceScope &temp_arrays_for_convert, blender::Vector<CustomDataLayer, 16> &vert_layers_to_write); -#endif void BKE_mesh_legacy_convert_verts_to_positions(Mesh *mesh); +#endif + /** * Recreate #MFace Tessellation. * |