Merge pull request #6151 from samcake/color

Fix the dark diffuse color for material without texture
This commit is contained in:
Brad Hefta-Gaub 2015-10-22 12:23:41 -07:00
commit 4a7f5751f4

View file

@ -147,7 +147,7 @@ void MeshPartPayload::bindMaterial(gpu::Batch& batch, const ModelRender::Locatio
batch.setResourceTexture(ModelRender::DIFFUSE_MAP_SLOT, textureCache->getGrayTexture()); batch.setResourceTexture(ModelRender::DIFFUSE_MAP_SLOT, textureCache->getGrayTexture());
} }
} else { } else {
batch.setResourceTexture(ModelRender::DIFFUSE_MAP_SLOT, textureCache->getGrayTexture()); batch.setResourceTexture(ModelRender::DIFFUSE_MAP_SLOT, textureCache->getWhiteTexture());
} }
// Normal map // Normal map