diff options
author | Loren Osborn <linux_dr> | 2022-05-11 16:37:38 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-05-11 19:03:26 +0300 |
commit | 502e1a44b9485184b199d5a22431d672d26735fe (patch) | |
tree | ad9a6423b6bc5ea568a81359a3a3b1224625ec8c /source/blender/io/usd | |
parent | 3e782bba7180b7f59cb378898bb677fbf3976996 (diff) |
Cleanup: fix compiler warnings on macOS
Differential Revision: https://developer.blender.org/D14917
Diffstat (limited to 'source/blender/io/usd')
-rw-r--r-- | source/blender/io/usd/intern/usd_reader_mesh.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc index 328b4109616..e2562eca69b 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.cc +++ b/source/blender/io/usd/intern/usd_reader_mesh.cc @@ -200,7 +200,7 @@ void USDMeshReader::read_object_data(Main *bmain, const double motionSampleTime) if (read_mesh != mesh) { /* FIXME: after 2.80; `mesh->flag` isn't copied by #BKE_mesh_nomain_to_mesh() */ /* read_mesh can be freed by BKE_mesh_nomain_to_mesh(), so get the flag before that happens. */ - short autosmooth = (read_mesh->flag & ME_AUTOSMOOTH); + uint16_t autosmooth = (read_mesh->flag & ME_AUTOSMOOTH); BKE_mesh_nomain_to_mesh(read_mesh, mesh, object_, &CD_MASK_MESH, true); mesh->flag |= autosmooth; } |