From 0765a5b22b18b95438e101939a23ffee00cf78d7 Mon Sep 17 00:00:00 2001
From: Tony Godfrey <tonygod@users.noreply.github.com>
Date: Thu, 12 Jul 2018 12:48:11 -0700
Subject: [PATCH] Fix for Unity 2018.1 (#54)

* Merged in changes from MicroGSD/master

* - Added support for Unity 2018.1+
- Modified unit tests to display execution time and improved test performance (removed multiple GameObject.Find calls)
- Added Clean up tests to RoadArchitect->Testing menu

* Remove meta files for missing/unused assets

* Add missing .meta files

* Fix for wrong Unity version symbol in GSDRoadUtil.cs causing exception in Unity 2018.1.x
Remove meta file for directory that doesn't exist on import
---
 Editor/Library/W.meta | 8 --------
 GSDRootUtil.cs        | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 Editor/Library/W.meta

diff --git a/Editor/Library/W.meta b/Editor/Library/W.meta
deleted file mode 100644
index 976de870..00000000
--- a/Editor/Library/W.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fb25cbfe030fd9244a54cd98bc33e7ce
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/GSDRootUtil.cs b/GSDRootUtil.cs
index c0e302a5..e2ddbad6 100644
--- a/GSDRootUtil.cs
+++ b/GSDRootUtil.cs
@@ -73,7 +73,7 @@ public static string GetPrefabString(GameObject tObj){
 			if(tObj != null){
 				tString = UnityEditor.AssetDatabase.GetAssetPath( tObj );
 				if(tString == null || tString.Length < 1){
-#if UNITY_2018_1_OR_NEWER
+#if UNITY_2018_2_OR_NEWER
                     Object parentObject = UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(tObj); 
 #else
                     Object parentObject = UnityEditor.PrefabUtility.GetPrefabParent(tObj);