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/wavefront_obj | |
parent | 1242e8b93caaad7be3a920d19add43a31bf442d0 (diff) | |
parent | 502e1a44b9485184b199d5a22431d672d26735fe (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/io/wavefront_obj')
-rw-r--r-- | source/blender/io/wavefront_obj/importer/obj_import_mesh.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc index fc40333c24d..8d560bd2c8c 100644 --- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc +++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc @@ -62,7 +62,7 @@ Object *MeshFromGeometry::create_mesh(Main *bmain, transform_object(obj, import_params); /* FIXME: after 2.80; `mesh->flag` isn't copied by #BKE_mesh_nomain_to_mesh() */ - const short autosmooth = (mesh->flag & ME_AUTOSMOOTH); + const uint16_t autosmooth = (mesh->flag & ME_AUTOSMOOTH); Mesh *dst = static_cast<Mesh *>(obj->data); BKE_mesh_nomain_to_mesh(mesh, dst, obj, &CD_MASK_EVERYTHING, true); dst->flag |= autosmooth; |