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

Merge branch 'gui' of https://github.com/DigitalPulseSoftware/NazaraEngine into gui 

Former-commit-id: c916f9e8ea65e837da46c45ba24448ef5c71eaa4 [formerly c65ac563584ac4a964d557f3f3b124cd65fdb737] [formerly da52e24493f3b6835fc33b62ebf57680288d57cb [formerly 1b4cedf373869c998c2505c146889a0e673bf6db]]
Former-commit-id: e225d991ef379f454c368789a6edad0d7cf59ef2 [formerly 28c5fe9f7176e6ea7070a860b1b5191c9ccec574]
Former-commit-id: d902c31743f9a2f33347b1a479d22d2baaaefc93
This commit is contained in:
Lynix 2016-09-15 13:17:11 +02:00
parent 72206a3ca3 487c9da235
commit c76d7dfdf2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/scripts/tools/ndk_server.lua
View File

@ -33,6 +33,7 @@ TOOL.FilesExcluded = {
"../SDK/**/Particle*Component.*", "../SDK/**/Particle*Component.*",
"../SDK/**/ParticleSystem.*", "../SDK/**/ParticleSystem.*",
"../SDK/**/RenderSystem.*", "../SDK/**/RenderSystem.*",
"../SDK/**/*Widget*.*",
"../SDK/**/LuaBinding_Audio.*", "../SDK/**/LuaBinding_Audio.*",
"../SDK/**/LuaBinding_Graphics.*", "../SDK/**/LuaBinding_Graphics.*",
"../SDK/**/LuaBinding_Renderer.*" "../SDK/**/LuaBinding_Renderer.*"

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;