quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply misc fixes from Markus Fischer and Rambetter

Browse Source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@329 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
TTimo
2009-12-31 18:45:35 +00:00
parent 8f437051fa
commit a54ff4a83e
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/model/remap.cpp
View File

@@ -224,13 +224,18 @@ private:
const char* surfShaderName = m_model->GetShaderNameForSurface(j);
IShader* shader = shader_for_remap(surfShaderName);
// m_shaders.push_back((shader) ? shader : (global_shader) ? global_shader : QERApp_Shader_ForName(surfShaderName));
if( shader ) {
m_shaders.push_back(shader);
} else if( global_shader ) {
m_shaders.push_back(global_shader);
} else {
m_shaders.push_back(QERApp_Shader_ForName(surfShaderName));
// Determine which shader it is going to be
if( !shader ) {
if( global_shader ) {
shader = global_shader;
} else {
shader = QERApp_Shader_ForName(surfShaderName);
}
}
// Add reference
shader->IncRef();
// Done, continue
m_shaders.push_back( shader );
}
}