sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gui 

Former-commit-id: dc210af8af6601458a94819b8a8a7e5fe95f5b5c [formerly 76e541353be06bf6fe63e1fe1d900ca527900013] [formerly e96fc9ec302c19011cdd8381fcf060fac147b794 [formerly bcc7f0e74882257759dc405b14e66c987c8ef1bd]]
Former-commit-id: 819f102a0c9665c5997f7156a44942a1aeea6608 [formerly 6708e884546b06e7664648cdbe6f3a9867f9922e]
Former-commit-id: 39d6d4e9b3ac3b7ff77c14a78e49dd58aca0bd10
This commit is contained in:
Lynix 2016-09-13 19:52:36 +02:00
parent 136fb65a6d c6767a0fbd
commit 174ba16774
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Graphics/Sprite.inl
View File

@ -89,7 +89,7 @@ namespace Nz
*/ */
inline const Color& Sprite::GetCornerColor(RectCorner corner) const inline const Color& Sprite::GetCornerColor(RectCorner corner) const
{ {
NazaraAssert(corner < m_cornerColor.size(), "Invalid corner"); NazaraAssert(static_cast<std::size_t>(corner) < m_cornerColor.size(), "Invalid corner");
return m_cornerColor[corner]; return m_cornerColor[corner];
} }
@ -164,7 +164,7 @@ namespace Nz
*/ */
inline void Sprite::SetCornerColor(RectCorner corner, const Color& color) inline void Sprite::SetCornerColor(RectCorner corner, const Color& color)
{ {
NazaraAssert(corner < m_cornerColor.size(), "Invalid corner"); NazaraAssert(static_cast<std::size_t>(corner) < m_cornerColor.size(), "Invalid corner");
m_cornerColor[corner] = color; m_cornerColor[corner] = color;