Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-04 19:24:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compilation issues on mac

Browse source
This commit is contained in:
samcake 2015-09-19 08:59:47 -07:00
parent 8941741508
commit 9a8dc6ca5d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/model/src/model/Asset.h
View file

@ -35,9 +35,9 @@ public:
}; };
static Version evalVersionFromID(ID id) { static Version evalVersionFromID(ID id) {
if (ID <= 0) { if (id <= 0) {
return DRAFT; return DRAFT;
} else (ID > 0) { } else {
return FINAL; return FINAL;
} }
} }

3
libraries/render-utils/src/GeometryCache.cpp
View file

@ -1786,8 +1786,7 @@ void NetworkGeometry::setTextureWithNameToURL(const QString& name, const QUrl& u
for (auto&& material : _materials) { for (auto&& material : _materials) {
QSharedPointer<NetworkTexture> matchingTexture = QSharedPointer<NetworkTexture>(); QSharedPointer<NetworkTexture> matchingTexture = QSharedPointer<NetworkTexture>();
if (material->diffuseTextureName == name) { if (material->diffuseTextureName == name) {
// TODO: Find a solution to the eye case material->diffuseTexture = textureCache->getTexture(url, DEFAULT_TEXTURE);
material->diffuseTexture = textureCache->getTexture(url, DEFAULT_TEXTURE, /* _geometry->meshes[i].isEye*/ false);
} else if (material->normalTextureName == name) { } else if (material->normalTextureName == name) {
material->normalTexture = textureCache->getTexture(url); material->normalTexture = textureCache->getTexture(url);
} else if (material->specularTextureName == name) { } else if (material->specularTextureName == name) {