This commit is contained in:
Atlante45 2015-05-11 14:31:22 +02:00
parent f941ca9601
commit e51040db53

View file

@ -2068,9 +2068,9 @@ void Model::segregateMeshGroups() {
bool hasSpecular = mesh.hasSpecularTexture(); bool hasSpecular = mesh.hasSpecularTexture();
bool hasLightmap = mesh.hasEmissiveTexture(); bool hasLightmap = mesh.hasEmissiveTexture();
bool isSkinned = state.clusterMatrices.size() > 1; bool isSkinned = state.clusterMatrices.size() > 1;
bool isWireframe = this->isWireframe(); bool wireframe = isWireframe();
if (isWireframe) { if (wireframe) {
translucentMesh = hasTangents = hasSpecular = hasLightmap = isSkinned = false; translucentMesh = hasTangents = hasSpecular = hasLightmap = isSkinned = false;
} }
@ -2091,7 +2091,7 @@ void Model::segregateMeshGroups() {
qCDebug(renderutils) << "materialID:" << materialID << "parts:" << mesh.parts.size(); qCDebug(renderutils) << "materialID:" << materialID << "parts:" << mesh.parts.size();
} }
RenderKey key(translucentMesh, hasLightmap, hasTangents, hasSpecular, isSkinned, isWireframe); RenderKey key(translucentMesh, hasLightmap, hasTangents, hasSpecular, isSkinned, wireframe);
// reuse or create the bucket corresponding to that key and insert the mesh as unsorted // reuse or create the bucket corresponding to that key and insert the mesh as unsorted
_renderBuckets[key.getRaw()]._unsortedMeshes.insertMulti(materialID, i); _renderBuckets[key.getRaw()]._unsortedMeshes.insertMulti(materialID, i);