diff options
| author | Campbell Barton <campbell@blender.org> | 2022-05-12 10:50:05 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-05-12 10:50:05 +0300 |
| commit | 14175043e53e0ea2c99ea3330fd35c4b1f06273e (patch) | |
| tree | 7f5a02e13bd45504498ce9c82f3acd5d06c36e17 /source/blender/io/usd/intern | |
| parent | 1242e8b93caaad7be3a920d19add43a31bf442d0 (diff) | |
| parent | 502e1a44b9485184b199d5a22431d672d26735fe (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/io/usd/intern')
| -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; } |