LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-11-19 19:19:14 -04:00
parent 3e80ec2257 b084934311
commit 247e1b6af0
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Shader.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ int w_Shader_getWarnings(lua_State *L)
static int _getCount(lua_State *L, int startidx, const Shader::UniformInfo *info)
{
return std::min(std::max(lua_gettop(L) - startidx, 1), info->count);
return std::min(std::max(lua_gettop(L) - startidx + 1, 1), info->count);
}
template <typename T>