Merge default into minor.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-01-12 22:52:24 -04:00
9 changed files with 22 additions and 8 deletions
+1 -1
View File
@@ -143,7 +143,7 @@ GLuint Shader::compileCode(ShaderStage stage, const std::string &code)
void Shader::mapActiveUniforms()
{
// Built-in uniform locations default to -1 (nonexistant.)
// Built-in uniform locations default to -1 (nonexistent.)
for (int i = 0; i < int(BUILTIN_MAX_ENUM); i++)
builtinUniforms[i] = -1;