diff --git a/src/Magnum/MeshTools/Interleave.h b/src/Magnum/MeshTools/Interleave.h index cca165de9..f1561c588 100644 --- a/src/Magnum/MeshTools/Interleave.h +++ b/src/Magnum/MeshTools/Interleave.h @@ -35,12 +35,6 @@ #include "Magnum/Magnum.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#include "Magnum/Buffer.h" -#include "Magnum/Mesh.h" -#endif - namespace Magnum { namespace MeshTools { namespace Implementation { @@ -178,49 +172,6 @@ template void interleaveInto(Containers::ArrayReference CORRADE_DEPRECATED("Use interleave(const T&...) instead") void interleave(Mesh& mesh, Buffer& buffer, BufferUsage usage, const T&... attributes) { - if(!mesh.isIndexed()) mesh.setCount(Implementation::AttributeCount{}(attributes...)); - buffer.setData(interleave(attributes...), usage); -} - -/** -@brief Write vertex attribute to array buffer and configure the mesh - -Simplified specialization of the above function for only one attribute array, -equivalent to the following: -@code -if(!mesh.isIndexed()) mesh.setCount(attribute.size()); -buffer.setData(attribute, usage); -@endcode - -@deprecated Use general-purpose @ref interleave(const T&...) instead. -*/ -template CORRADE_DEPRECATED("Use interleave(const T&...) instead") typename std::enable_if::value, void>::type interleave(Mesh& mesh, Buffer& buffer, BufferUsage usage, const T& attribute) { - if(!mesh.isIndexed()) mesh.setCount(attribute.size()); - buffer.setData(attribute, usage); -} -#endif - }} #endif