From f64481c5107ee9b1906e1fe40dfed23ca54a84a0 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 7 Jan 2016 16:47:48 +1300
Subject: [PATCH] Warn user if cannot evaluate model's textures property

---
 .../entities-renderer/src/RenderableModelEntityItem.cpp     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index f5090cc20c..6ec77a17bf 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -129,7 +129,11 @@ void RenderableModelEntityItem::remapTextures() {
     QJsonObject currentTexturesAsJsonObject = currentTexturesAsJson.object();
     QVariantMap currentTextureMap = currentTexturesAsJsonObject.toVariantMap();
 
-    QJsonDocument texturesAsJson = QJsonDocument::fromJson(_textures.toUtf8());
+    QJsonParseError error;
+    QJsonDocument texturesAsJson = QJsonDocument::fromJson(_textures.toUtf8(), &error);
+    if (error.error != QJsonParseError::NoError) {
+        qCWarning(entitiesrenderer) << "Could not evaluate textures property:" << _textures;
+    }
     QJsonObject texturesAsJsonObject = texturesAsJson.object();
     QVariantMap textureMap = texturesAsJsonObject.toVariantMap();