Commit: f8e871168a8ddf374ff578ce8ef817041de62e4e Author: Michael Kowalski Date: Mon Oct 17 16:33:09 2022 -0400 Branches: universal-scene-description https://developer.blender.org/rBf8e871168a8ddf374ff578ce8ef817041de62e4e
Fix linux/mac build warnings and errors. =================================================================== M source/blender/io/usd/intern/usd_reader_shape.cc M source/blender/io/usd/intern/usd_reader_shape.h =================================================================== diff --git a/source/blender/io/usd/intern/usd_reader_shape.cc b/source/blender/io/usd/intern/usd_reader_shape.cc index 92597c290ee..9038238b387 100644 --- a/source/blender/io/usd/intern/usd_reader_shape.cc +++ b/source/blender/io/usd/intern/usd_reader_shape.cc @@ -37,7 +37,7 @@ USDShapeReader::USDShapeReader(const pxr::UsdPrim &prim, { } -void USDShapeReader::create_object(Main *bmain, double motionSampleTime) +void USDShapeReader::create_object(Main *bmain, double /* motionSampleTime */) { Mesh *mesh = BKE_mesh_add(bmain, name_.c_str()); object_ = BKE_object_add_only_object(bmain, OB_MESH, name_.c_str()); @@ -72,16 +72,16 @@ void USDShapeReader::read_values(const double motionSampleTime, pxr::VtIntArray &face_counts) { pxr::VtValue meshPoints = Adapter::GetMeshPoints(prim_, motionSampleTime); - positions = meshPoints.Get<pxr::VtArray<pxr::GfVec3f>>(); - pxr::HdMeshTopology meshTopologyValue = Adapter::GetMeshTopology().Get<pxr::HdMeshTopology>(); + positions = meshPoints.template Get<pxr::VtArray<pxr::GfVec3f>>(); + pxr::HdMeshTopology meshTopologyValue = Adapter::GetMeshTopology().template Get<pxr::HdMeshTopology>(); face_counts = meshTopologyValue.GetFaceVertexCounts(); face_indices = meshTopologyValue.GetFaceVertexIndices(); } struct Mesh *USDShapeReader::read_mesh(struct Mesh *existing_mesh, double motionSampleTime, - int read_flag, - const char **err_str) + int /* read_flag */, + const char ** /* err_str */) { if (!prim_) { return existing_mesh; diff --git a/source/blender/io/usd/intern/usd_reader_shape.h b/source/blender/io/usd/intern/usd_reader_shape.h index 25f08aba207..7e91be1d4f4 100644 --- a/source/blender/io/usd/intern/usd_reader_shape.h +++ b/source/blender/io/usd/intern/usd_reader_shape.h @@ -32,7 +32,7 @@ class USDShapeReader : public USDGeomReader { const char **err_str) override; bool is_time_varying(); - virtual bool topology_changed(const Mesh * /* existing_mesh */, double /* motionSampleTime */) + virtual bool topology_changed(const Mesh * /* existing_mesh */, double /* motionSampleTime */) override { return false; }; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs