Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb

libraries/model-networking/src/model-networking/ModelCache.cpp

@@ -66,7 +66,7 @@ void GeometryMappingResource::downloadFinished(const QByteArray& data) {
         GeometryExtra extra{ mapping, textureBaseUrl };
 
         // Get the raw GeometryResource, not the wrapped NetworkGeometry
-        _geometryResource = modelCache->getResource(url, QUrl(), true, &extra).staticCast<GeometryResource>();
+        _geometryResource = modelCache->getResource(url, QUrl(), false, &extra).staticCast<GeometryResource>();
 
         if (_geometryResource->isLoaded()) {
             onGeometryMappingLoaded(!_geometryResource->getURL().isEmpty());
@@ -226,7 +226,7 @@ QSharedPointer<Resource> ModelCache::createResource(const QUrl& url, const QShar
 std::shared_ptr<NetworkGeometry> ModelCache::getGeometry(const QUrl& url, const QVariantHash& mapping, const QUrl& textureBaseUrl) {
     GeometryExtra geometryExtra = { mapping, textureBaseUrl };
     GeometryResource::Pointer resource = getResource(url, QUrl(), true, &geometryExtra).staticCast<GeometryResource>();
-    return std::make_shared<NetworkGeometry>(resource);
+    return resource ? std::make_shared<NetworkGeometry>(resource) : NetworkGeometry::Pointer();
 }
 
 const QVariantMap Geometry::getTextures() const {

libraries/script-engine/src/BatchLoader.cpp

@@ -18,6 +18,7 @@
 #include <NetworkAccessManager.h>
 #include <SharedUtil.h>
 #include "ResourceManager.h"
+#include "ScriptEngines.h"
 
 BatchLoader::BatchLoader(const QList<QUrl>& urls) 
     : QObject(),
@@ -34,8 +35,9 @@ void BatchLoader::start() {
     }
 
     _started = true;
-    
-    for (const auto& url : _urls) {
+
+    for (const auto& rawURL : _urls) {
+        QUrl url = expandScriptUrl(normalizeScriptURL(rawURL));
         auto request = ResourceManager::createResourceRequest(this, url);
         if (!request) {
             _data.insert(url, QString());

libraries/script-engine/src/ScriptEngine.cpp

@@ -220,11 +220,10 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) {
         return;
     }
 
-    _fileNameString = scriptURL.toString();
+    QUrl url = expandScriptUrl(normalizeScriptURL(scriptURL));
+    _fileNameString = url.toString();
     _isReloading = reload;
 
-    QUrl url(scriptURL);
-
     bool isPending;
     auto scriptCache = DependencyManager::get<ScriptCache>();
     scriptCache->getScript(url, this, isPending, reload);
@@ -848,7 +847,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
     QUrl url(include);
     // first lets check to see if it's already a full URL
     if (!url.scheme().isEmpty()) {
-        return url;
+        return expandScriptUrl(normalizeScriptURL(url));
     }
 
     // we apparently weren't a fully qualified url, so, let's assume we're relative
@@ -865,7 +864,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
     }
 
     // at this point we should have a legitimate fully qualified URL for our parent
-    url = parentURL.resolved(url);
+    url = expandScriptUrl(normalizeScriptURL(parentURL.resolved(url)));
     return url;
 }
 

libraries/script-engine/src/ScriptEngines.cpp

@@ -429,7 +429,7 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL
         connect(scriptEngine, &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError);
 
         // get the script engine object to load the script at the designated script URL
-        scriptEngine->loadURL(QUrl(expandScriptUrl(scriptUrl.toString())), reload);
+        scriptEngine->loadURL(scriptUrl, reload);
     }
 
     return scriptEngine;

libraries/script-engine/src/ScriptsModel.cpp

@@ -309,6 +309,9 @@ void ScriptsModel::rebuildTree() {
             QString hash;
             QStringList pathList = script->getLocalPath().split(tr("/"));
             pathList.removeLast();
+            if (pathList.isEmpty()) {
+                continue;
+            }
             QStringList::const_iterator pathIterator;
             for (pathIterator = pathList.constBegin(); pathIterator != pathList.constEnd(); ++pathIterator) {
                 hash.append(*pathIterator + "/");