Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7501 from zzmp/fix/parse-tex

Browse source 
Respond to error from free in texture parsing
This commit is contained in:
Brad Hefta-Gaub 2016-03-30 08:53:15 -07:00
commit 32308c7810
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -105,7 +105,7 @@ int RenderableModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned c
QVariantMap RenderableModelEntityItem::parseTexturesToMap(QString textures) { QVariantMap RenderableModelEntityItem::parseTexturesToMap(QString textures) {
// If textures are unset, revert to original textures // If textures are unset, revert to original textures
if (textures == "") { if (textures.isEmpty()) {
return _originalTextures; return _originalTextures;
} }
@ -120,7 +120,9 @@ QVariantMap RenderableModelEntityItem::parseTexturesToMap(QString textures) {
qCWarning(entitiesrenderer) << "Could not evaluate textures property value:" << _textures; qCWarning(entitiesrenderer) << "Could not evaluate textures property value:" << _textures;
return _originalTextures; return _originalTextures;
} }
return texturesJson.object().toVariantMap();
auto parsed = texturesJson.toVariant();
return parsed.toMap();
} }
void RenderableModelEntityItem::remapTextures() { void RenderableModelEntityItem::remapTextures() {