Browse Source

GL: fixed a 64-to-32-bit conversion warning on MSVC.

pull/362/head
Vladimír Vondruš 7 years ago
parent
commit
51cd4b3dd0
  1. 2
      doc/changelog.dox
  2. 2
      src/Magnum/GL/Mesh.h

2
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

2
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<UnsignedInt location, class T> void addVertexAttribute(typename std::enable_if<std::is_same<typename Implementation::Attribute<T>::ScalarType, Float>::value, Buffer&>::type buffer, const Attribute<location, T>& attribute, GLintptr offset, GLsizei stride, GLuint divisor) {
for(UnsignedInt i = 0; i != Attribute<location, T>::VectorCount; ++i)

Loading…
Cancel
Save