real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions 2 Activity

Testing something different in the hope it helps with a bug reported on the forums

Browse Source 
This was SVN commit r12627.
This commit is contained in:
myconid 2012-09-04 11:09:36 +00:00
parent 6adccf3660
commit f92cda7a91
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/renderer/ModelRenderer.cpp
View File

@ -633,7 +633,10 @@ void ShaderModelRenderer::Render(const RenderModifierPtr& modifier, const CShade
CMaterial::SamplersVector samplers = model->GetMaterial().GetSamplers();
size_t samplersNum = samplers.size();
// make sure the vectors are the right virtual sizes, and also
// Commenting this optimisation out temporarily,
// in case it helps with a bug reported on the forums:
/*// make sure the vectors are the right virtual sizes, and also
// reallocate if there are more samplers than expected.
if (currentTexs.size() != samplersNum)
{
@ -673,8 +676,14 @@ void ShaderModelRenderer::Render(const RenderModifierPtr& modifier, const CShade
shader->BindTexture(bind, samp.Sampler->GetHandle());
currentTexs[s] = newTex;
}
}*/
for (size_t s = 0; s < samplersNum; ++s)
{
CMaterial::TextureSampler &samp = samplers[s];
shader->BindTexture(samp.Name.c_str(), samp.Sampler->GetHandle());
}
// Bind modeldef when it changes
CModelDef* newModeldef = model->GetModelDef().get();
if (newModeldef != currentModeldef)