From 0d1daecf1281a0eff8dae3805064c2581e582ec9 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 27 Aug 2016 12:13:34 +1200
Subject: [PATCH] Provide count of textures for entity items

---
 libraries/entities/src/EntityItemProperties.cpp | 16 +++++++++++-----
 scripts/system/libraries/entityList.js          |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 5fdb3ba2d1..a7e6ba1261 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -582,12 +582,18 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
 
     // Rendering info
     if (!skipDefaults) {
+        /*
+        renderInfo.setProperty("verticesCount", QScriptValue(randIntInRange(6, 1000)));
+        renderInfo.setProperty("texturesCount", QScriptValue(randIntInRange(0, 10)));
+        renderInfo.setProperty("texturesSize", QScriptValue(randIntInRange(0, 2048)));
+        renderInfo.setProperty("hasTransparent", QScriptValue(randIntInRange(0, 1)));
+        renderInfo.setProperty("drawCalls", QScriptValue(randIntInRange(10, 5000)));
+        */
+
         QScriptValue renderInfo = engine->newObject();
-        renderInfo.setProperty("verticesCount", QScriptValue(10));
-        renderInfo.setProperty("texturesCount", QScriptValue(2));
-        renderInfo.setProperty("texturesSize", QScriptValue(1024));
-        renderInfo.setProperty("hasTransparent", QScriptValue(false));
-        renderInfo.setProperty("drawCalls", QScriptValue(30));
+        if (_type == EntityTypes::Model || _type == EntityTypes::PolyLine || _type == EntityTypes::ParticleEffect) {
+            renderInfo.setProperty("texturesCount", QScriptValue(_textureNames.count()));
+        }
         COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER_NO_SKIP(renderInfo, renderInfo);  // Gettable but not settable
     }
 
diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js
index 2eeb64e85e..f719ff6d31 100644
--- a/scripts/system/libraries/entityList.js
+++ b/scripts/system/libraries/entityList.js
@@ -62,8 +62,8 @@ EntityListTool = function(opts) {
                 locked: properties.locked,
                 visible: properties.visible,
                 verticesCount: properties.renderInfo.verticesCount,
-                texturesCount: properties.renderInfo.texturesCount,
-                texturesSize:properties.renderInfo.texturesSize,
+                texturesCount: properties.renderInfo.texturesCount ? properties.renderInfo.texturesCount : "",
+                texturesSize: properties.renderInfo.texturesSize ? properties.renderInfo.texturesSize : "",
                 hasTransparent: properties.renderInfo.hasTransparent,
                 drawCalls: properties.renderInfo.drawCalls,
                 hasScript: properties.script !== ""