Merge pull request #2060 from ey6es/master

Fix for Xcode warnings.
This commit is contained in:
Andrzej Kapolka 2014-02-23 20:12:46 -08:00
commit c4befbef38

View file

@ -52,8 +52,8 @@ bool Model::isLoadedWithTextures() const {
}
foreach (const NetworkMesh& mesh, _geometry->getMeshes()) {
foreach (const NetworkMeshPart& part, mesh.parts) {
if (part.diffuseTexture && !part.diffuseTexture->isLoaded() ||
part.normalTexture && !part.normalTexture->isLoaded()) {
if ((part.diffuseTexture && !part.diffuseTexture->isLoaded()) ||
(part.normalTexture && !part.normalTexture->isLoaded())) {
return false;
}
}