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

Fixed love.graphics.newShader crashing when extern variables with very short names are used

Browse Source
This commit is contained in:
Alex Szpakowski
2013-07-11 19:26:50 -03:00
parent 267d901cd6
commit 2ccbbe1c64
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Shader.cpp
+6 -2
View File
@@ -219,8 +219,12 @@ void Shader::mapActiveUniforms()
delete[] cname; delete[] cname;
// glGetActiveUniform appends "[0]" to the end of array uniform names... // glGetActiveUniform appends "[0]" to the end of array uniform names...
if (u.name.find("[0]") == u.name.length() - 3) if (u.name.length() > 3)
u.name.erase(u.name.length() - 3); {
size_t findpos = u.name.find("[0]");
if (findpos != std::string::npos && findpos == u.name.length() - 3)
u.name.erase(u.name.length() - 3);
}
if (u.location != -1) if (u.location != -1)
uniforms[u.name] = u; uniforms[u.name] = u;