From 51cd4b3dd0a27948ea49e770613980a5d3821608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 1 Jul 2019 17:13:56 +0200 Subject: [PATCH] GL: fixed a 64-to-32-bit conversion warning on MSVC. --- doc/changelog.dox | 2 ++ src/Magnum/GL/Mesh.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index e8cbd2520..2da0aa543 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -375,6 +375,8 @@ See also: - Worked around a bug in the NVCC compiler on Windows involving @ref Math::RectangularMatrix::DiagonalSize to make Magnum usable with CUDA (see [mosra/magnum#345](https://github.com/mosra/magnum/issues/345)) +- Fixed a 64-to-32-bit conversion warning on MSVC in @ref GL::Mesh internals + (see [mosra/magnum#352](https://github.com/mosra/magnum/issues/352)) @subsection changelog-latest-bugfixes Bug fixes diff --git a/src/Magnum/GL/Mesh.h b/src/Magnum/GL/Mesh.h index 837aa3142..66c7f4485 100644 --- a/src/Magnum/GL/Mesh.h +++ b/src/Magnum/GL/Mesh.h @@ -1009,7 +1009,7 @@ class MAGNUM_GL_EXPORT Mesh: public AbstractObject { /* Add the gap to offset for next attribute */ addVertexBufferInternal(buffer, offset+gap, stride, divisor, attributes...); } - void addVertexBufferInternal(Buffer&, GLsizei, GLuint, GLintptr) {} + void addVertexBufferInternal(Buffer&, GLintptr, GLsizei, GLuint) {} template void addVertexAttribute(typename std::enable_if::ScalarType, Float>::value, Buffer&>::type buffer, const Attribute& attribute, GLintptr offset, GLsizei stride, GLuint divisor) { for(UnsignedInt i = 0; i != Attribute::VectorCount; ++i)