From 0d039b1cdb16c06af447d9bc54afec8fe699545d Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 23 Jul 2014 14:38:37 -0700
Subject: [PATCH] Fixed invokeMethod bug + removed debug

---
 examples/editModels.js                            | 1 -
 interface/src/models/ModelTreeRenderer.h          | 3 ++-
 libraries/models/src/ModelsScriptingInterface.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/editModels.js b/examples/editModels.js
index 458ddf7b4a..ea88c87bea 100644
--- a/examples/editModels.js
+++ b/examples/editModels.js
@@ -1168,7 +1168,6 @@ function handeMenuEvent(menuItem){
             angles.z = array[7].value;
             selectedModelProperties.modelRotation = Quat.fromVec3Degrees(angles);
             selectedModelProperties.radius = array[8].value / 2;
-            print(selectedModelProperties.radius);
 
             Models.editModel(selectedModelID, selectedModelProperties);
         }
diff --git a/interface/src/models/ModelTreeRenderer.h b/interface/src/models/ModelTreeRenderer.h
index b6df71565d..d69b85efe9 100644
--- a/interface/src/models/ModelTreeRenderer.h
+++ b/interface/src/models/ModelTreeRenderer.h
@@ -27,6 +27,7 @@
 
 // Generic client side Octree renderer class.
 class ModelTreeRenderer : public OctreeRenderer, public ModelItemFBXService {
+    Q_OBJECT
 public:
     ModelTreeRenderer();
     virtual ~ModelTreeRenderer();
@@ -56,7 +57,7 @@ public:
 
 protected:
     void clearModelsCache();
-    Model* getModel(const ModelItem& modelItem);
+    Q_INVOKABLE Model* getModel(const ModelItem& modelItem);
     QMap<uint32_t, Model*> _knownModelsItemModels;
     QMap<uint32_t, Model*> _unknownModelsItemModels;
 };
diff --git a/libraries/models/src/ModelsScriptingInterface.cpp b/libraries/models/src/ModelsScriptingInterface.cpp
index 634039f949..d2c3ed1ba7 100644
--- a/libraries/models/src/ModelsScriptingInterface.cpp
+++ b/libraries/models/src/ModelsScriptingInterface.cpp
@@ -70,7 +70,7 @@ ModelItemProperties ModelsScriptingInterface::getModelProperties(ModelItemID mod
     if (_modelTree) {
         _modelTree->lockForRead();
         ModelItem* model = const_cast<ModelItem*>(_modelTree->findModelByID(identity.id, true));
-        if (model) {
+        if (model && _modelTree->getGeometryForModel(*model)) {
             model->setSittingPoints(_modelTree->getGeometryForModel(*model)->sittingPoints);
             results.copyFromModelItem(*model);
         } else {