From ec4f9fdc11bc2584f289276b6dc577e2559699f5 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 08:31:05 -0500
Subject: [PATCH] fix displayName

---
 .../entities-renderer/src/RenderableModelEntityItem.cpp   | 8 ++++----
 libraries/fbx/src/FBXReader.cpp                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 0e23ff3bff..6eed62522f 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1300,7 +1300,8 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
                 auto entityRenderer = static_cast<EntityRenderer*>(&data);
                 entityRenderer->clearSubRenderItemIDs();
             });
-            emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelRemovedFromScene(entity->getEntityItemID(), NestableType::Entity, _model);
+            emit DependencyManager::get<scriptable::ModelProviderFactory>()->
+                modelRemovedFromScene(entity->getEntityItemID(), NestableType::Entity, _model);
         }
         return;
     }
@@ -1311,10 +1312,9 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
         connect(model.get(), &Model::setURLFinished, this, [&](bool didVisualGeometryRequestSucceed) {
             setKey(didVisualGeometryRequestSucceed);
             emit requestRenderUpdate();
-            auto factory = DependencyManager::get<scriptable::ModelProviderFactory>().data();
-            qDebug() << "leopoly didVisualGeometryRequestSucceed" << didVisualGeometryRequestSucceed << QThread::currentThread() << _model.get();
             if(didVisualGeometryRequestSucceed) {
-                emit factory->modelAddedToScene(entity->getEntityItemID(), NestableType::Entity, _model);
+                emit DependencyManager::get<scriptable::ModelProviderFactory>()->
+                    modelAddedToScene(entity->getEntityItemID(), NestableType::Entity, _model);
             }
         });
         connect(model.get(), &Model::requestRenderUpdate, this, &ModelEntityRenderer::requestRenderUpdate);
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 278a68f312..1e59646795 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -1987,7 +1987,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                 if (mesh._mesh) {
                     mesh._mesh->modelName = name.toStdString();
                     if (!mesh._mesh->displayName.size()) {
-                        mesh._mesh->displayName = mesh._mesh->displayName + "#" + name;
+                        mesh._mesh->displayName = QString("#%1").arg(name).toStdString();
                     }
                 } else {
                     qDebug() << "modelName but no mesh._mesh" << name;