diff --git a/src/Magnum/MeshView.h b/src/Magnum/MeshView.h index 45b8631e6..dbe57a574 100644 --- a/src/Magnum/MeshView.h +++ b/src/Magnum/MeshView.h @@ -164,7 +164,8 @@ class MAGNUM_EXPORT MeshView { * available there. * @see @ref setCount() */ - MeshView& setIndexRange(Int first, UnsignedInt start, UnsignedInt end); + /* MinGW/MSVC needs inline also here to avoid linkage conflicts */ + inline MeshView& setIndexRange(Int first, UnsignedInt start, UnsignedInt end); #ifdef MAGNUM_BUILD_DEPRECATED /** diff --git a/src/Magnum/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h index 3be81b3eb..7173794bc 100644 --- a/src/Magnum/Shaders/Flat.h +++ b/src/Magnum/Shaders/Flat.h @@ -200,7 +200,8 @@ template class MAGNUM_SHADERS_EXPORT Flat: public Abstra * multiplied with texture if @ref Flag::Textured is set. * @see @ref setTexture() */ - Flat& setColor(const Color4& color); + /* MSVC needs inline also here to avoid linkage conflicts */ + inline Flat& setColor(const Color4& color); /** * @brief Set texture