From e4f12c81e01eeef7a5d01e684ed29958b354a54b Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 30 Mar 2016 14:11:36 -0700 Subject: [PATCH] Get remap textures through getter --- .../entities-renderer/src/RenderableModelEntityItem.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 13942dc282..8134c4d8d7 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -117,12 +117,11 @@ QVariantMap RenderableModelEntityItem::parseTexturesToMap(QString textures) { QJsonParseError error; QJsonDocument texturesJson = QJsonDocument::fromJson(textures.toUtf8(), &error); if (error.error != QJsonParseError::NoError) { - qCWarning(entitiesrenderer) << "Could not evaluate textures property value:" << _textures; + qCWarning(entitiesrenderer) << "Could not evaluate textures property value:" << textures; return _originalTextures; } - auto parsed = texturesJson.toVariant(); - return parsed.toMap(); + return texturesJson.toVariant().toMap(); } void RenderableModelEntityItem::remapTextures() { @@ -144,7 +143,7 @@ void RenderableModelEntityItem::remapTextures() { _currentTextures = _originalTextures; } - auto textures = parseTexturesToMap(_textures); + auto textures = parseTexturesToMap(getTextures()); if (textures != _currentTextures) { geometry->setTextures(textures);