From 063320771ca7d19b916f8ce373d4bf3f01c5d0fa Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Thu, 3 Sep 2015 16:37:24 -0700
Subject: [PATCH 1/2] fix a bug in entity script includes and file based
 includes on windows

---
 libraries/script-engine/src/BatchLoader.cpp  | 4 ----
 libraries/shared/src/RegisteredMetaTypes.cpp | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/libraries/script-engine/src/BatchLoader.cpp b/libraries/script-engine/src/BatchLoader.cpp
index db0743808f..e6115324c9 100644
--- a/libraries/script-engine/src/BatchLoader.cpp
+++ b/libraries/script-engine/src/BatchLoader.cpp
@@ -58,11 +58,7 @@ void BatchLoader::start() {
             connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
 
         } else {
-#ifdef _WIN32
-            QString fileName = url.toString();
-#else
             QString fileName = url.toLocalFile();
-#endif
 
             qCDebug(scriptengine) << "Reading file at " << fileName;
 
diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp
index 2c4b213fcb..b2389f4db6 100644
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@@ -26,8 +26,7 @@ static int quatMetaTypeId = qRegisterMetaType<glm::quat>();
 static int xColorMetaTypeId = qRegisterMetaType<xColor>();
 static int pickRayMetaTypeId = qRegisterMetaType<PickRay>();
 static int collisionMetaTypeId = qRegisterMetaType<Collision>();
-
-
+static int qMapURLStringMetaTypeId = qRegisterMetaType<QMap<QUrl,QString>>();
 
 void registerMetaTypes(QScriptEngine* engine) {
     qScriptRegisterMetaType(engine, vec4toScriptValue, vec4FromScriptValue);

From b0f239b89dca2799f7d3707caf3133877c56716a Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Thu, 3 Sep 2015 19:06:26 -0700
Subject: [PATCH 2/2] also make sure local file includes work for non-entity
 scripts

---
 libraries/script-engine/src/BatchLoader.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libraries/script-engine/src/BatchLoader.cpp b/libraries/script-engine/src/BatchLoader.cpp
index e6115324c9..ac0cafa6a9 100644
--- a/libraries/script-engine/src/BatchLoader.cpp
+++ b/libraries/script-engine/src/BatchLoader.cpp
@@ -60,6 +60,12 @@ void BatchLoader::start() {
         } else {
             QString fileName = url.toLocalFile();
 
+            // sometimes on windows, we see the toLocalFile() return null, 
+            // in this case we will attempt to simply use the url as a string
+            if (fileName.isEmpty()) {
+                fileName = url.toString();
+            }
+
             qCDebug(scriptengine) << "Reading file at " << fileName;
 
             QFile scriptFile(fileName);