From 83ee04b3623f051a2d804b53a12607fce557f25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 2 Feb 2023 22:27:38 +0100 Subject: [PATCH] Trade: don't do an unnecessary cast for a MeshAttributeData view. Same as previous commit, would cause ambiguity with an upcoming StridedArrayView "updimensioning" constructor. --- src/Magnum/Trade/Test/MeshDataTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Trade/Test/MeshDataTest.cpp b/src/Magnum/Trade/Test/MeshDataTest.cpp index fd4141b6a..de2e64386 100644 --- a/src/Magnum/Trade/Test/MeshDataTest.cpp +++ b/src/Magnum/Trade/Test/MeshDataTest.cpp @@ -889,7 +889,7 @@ void MeshDataTest::constructAttribute2DNonContiguous() { void MeshDataTest::constructAttributeTypeErased() { const Vector3 positionData[3]{}; - MeshAttributeData positions{MeshAttribute::Position, VertexFormat::Vector3, Containers::StridedArrayView1D{positionData}}; + MeshAttributeData positions{MeshAttribute::Position, VertexFormat::Vector3, positionData}; CORRADE_VERIFY(!positions.isOffsetOnly()); CORRADE_COMPARE(positions.arraySize(), 0); CORRADE_COMPARE(positions.name(), MeshAttribute::Position); @@ -1131,7 +1131,7 @@ void MeshDataTest::constructArrayAttribute2DNonContiguous() { void MeshDataTest::constructArrayAttributeTypeErased() { Vector2 vertexData[3*4]; Containers::StridedArrayView1D attribute{vertexData, 3, 4*sizeof(Vector2)}; - MeshAttributeData data{meshAttributeCustom(35), VertexFormat::Vector2, Containers::StridedArrayView1D{attribute}, 4}; + MeshAttributeData data{meshAttributeCustom(35), VertexFormat::Vector2, attribute, 4}; CORRADE_VERIFY(!data.isOffsetOnly()); CORRADE_COMPARE(data.name(), meshAttributeCustom(35)); CORRADE_COMPARE(data.format(), VertexFormat::Vector2);