From 502e1a44b9485184b199d5a22431d672d26735fe Mon Sep 17 00:00:00 2001 From: Loren Osborn Date: Wed, 11 May 2022 15:37:38 +0200 Subject: Cleanup: fix compiler warnings on macOS Differential Revision: https://developer.blender.org/D14917 --- source/blender/io/usd/intern/usd_reader_mesh.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/io/usd/intern') 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; } -- cgit v1.2.3