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: 8663c06042dcddd79b65edd376a5d741a18e8b14 [formerly b30644fc68a2a27550a77b73d7d558b3980a430a] [formerly 8a444fb9d8b0e0eab3ddd50d85c82b918514337d [formerly 4c09129a5ff3b423d89535e1a6a7eda8e2727d6d]]
Former-commit-id: 464e82dbb668e330966a8466797b5d9b4549866c [formerly f134c82285e8241ea3f7cea7251b3281670b43b5]
Former-commit-id: 037696eee6648e5819bdfedac3ef94527b3cf630
This commit is contained in:
Lynix 2016-09-15 13:17:11 +02:00
parent 9438f519bb 320ce3e1d5
commit 115920ba4c
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;