Cleanup: fix compiler warnings on macOS
Differential Revision: https://developer.blender.org/D14917
This commit is contained in:
parent
3e782bba71
commit
502e1a44b9
Notes:
blender-bot
2023-02-14 07:39:44 +01:00
Referenced by issue #97737, GPU Subdivision: Crash after opening particular files
|
@ -668,12 +668,12 @@ Mesh *curve_to_mesh_sweep(const CurvesGeometry &main,
|
|||
|
||||
Vector<std::byte> eval_buffer;
|
||||
|
||||
Curves main_id = {nullptr};
|
||||
Curves main_id = {{nullptr}};
|
||||
main_id.geometry = reinterpret_cast<const ::CurvesGeometry &>(main);
|
||||
CurveComponent main_component;
|
||||
main_component.replace(&main_id, GeometryOwnershipType::Editable);
|
||||
|
||||
Curves profile_id = {nullptr};
|
||||
Curves profile_id = {{nullptr}};
|
||||
profile_id.geometry = reinterpret_cast<const ::CurvesGeometry &>(profile);
|
||||
CurveComponent profile_component;
|
||||
profile_component.replace(&profile_id, GeometryOwnershipType::Editable);
|
||||
|
|
|
@ -622,7 +622,7 @@ void AbcMeshReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSelec
|
|||
if (read_mesh != mesh) {
|
||||
/* XXX 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, m_object, &CD_MASK_EVERYTHING, true);
|
||||
mesh->flag |= autosmooth;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -280,7 +280,7 @@ typedef struct Mesh {
|
|||
/** Various flags used when editing the mesh. */
|
||||
char editflag;
|
||||
/** Mostly more flags used when editing or displaying the mesh. */
|
||||
short flag;
|
||||
uint16_t flag;
|
||||
|
||||
/**
|
||||
* The angle for auto smooth in radians. `M_PI` (180 degrees) causes all edges to be smooth.
|
||||
|
|
Loading…
Reference in New Issue