From de374c0cacf6b342227e2b8e40a0ac096eeb4f1a Mon Sep 17 00:00:00 2001 From: samcake Date: Mon, 21 Mar 2016 17:51:57 -0700 Subject: [PATCH] Switching emissive and lightmap somewhere but not big issue --- .../model-networking/src/model-networking/ModelCache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp index 9c2725a919..2b142d95d5 100644 --- a/libraries/model-networking/src/model-networking/ModelCache.cpp +++ b/libraries/model-networking/src/model-networking/ModelCache.cpp @@ -213,10 +213,10 @@ void NetworkGeometry::setTextureWithNameToURL(const QString& name, const QUrl& u networkMaterial->setTextureMap(model::MaterialKey::EMISSIVE_MAP, emissiveMap); } else if (material->lightmapTextureName == name) { - material->emissiveTexture = textureCache->getTexture(url, LIGHTMAP_TEXTURE); + material->lightmapTexture = textureCache->getTexture(url, LIGHTMAP_TEXTURE); auto lightmapMap = model::TextureMapPointer(new model::TextureMap()); - lightmapMap->setTextureSource(material->emissiveTexture->_textureSource); + lightmapMap->setTextureSource(material->lightmapTexture->_textureSource); lightmapMap->setTextureTransform( oldTextureMaps[model::MaterialKey::LIGHTMAP_MAP]->getTextureTransform()); glm::vec2 oldOffsetScale =