FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set the filename as the OSG object name on shaders - should have done this years ago :)

Browse Source
This commit is contained in:
James Turner
2012-04-04 16:44:23 +01:00
parent 95a9d7a229
commit 8d0330675a
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/Effect.cxx
+1
View File
@@ -839,6 +839,7 @@ void ShaderProgramBuilder::buildAttribute(Effect* effect, Pass* pass,
program->addShader(sitr->second.get()); program->addShader(sitr->second.get());
} else { } else {
ref_ptr<Shader> shader = new Shader(stype); ref_ptr<Shader> shader = new Shader(stype);
shader->setName(fileName);
if (shader->loadShaderSourceFromFile(fileName)) { if (shader->loadShaderSourceFromFile(fileName)) {
program->addShader(shader.get()); program->addShader(shader.get());
shaderMap.insert(ShaderMap::value_type(skey, shader)); shaderMap.insert(ShaderMap::value_type(skey, shader));