From c1ad7f5247a7c0ffe9ccf2815a79ffe4192eb844 Mon Sep 17 00:00:00 2001
From: Paul Du Bois <pld@google.com>
Date: Wed, 21 Aug 2019 13:17:07 -0700
Subject: [PATCH] Don't put Editor/ code into standalone builds

Fixes #37

Change-Id: Id000b015f5f62e0f2cc2501f56b05a5505a392ee
---
 .../TiltBrushToolkitThirdPartyEditor.asmdef      | 16 ++++++++++++++++
 .../TiltBrushToolkitThirdPartyEditor.asmdef.meta |  7 +++++++
 .../Scripts/Editor/TiltBrushToolkitEditor.asmdef |  8 +++++---
 UnitySDK/ProjectSettings/ProjectVersion.txt      |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 UnitySDK/Assets/ThirdParty/Reaktion/Editor/TiltBrushToolkitThirdPartyEditor.asmdef
 create mode 100644 UnitySDK/Assets/ThirdParty/Reaktion/Editor/TiltBrushToolkitThirdPartyEditor.asmdef.meta

diff --git a/UnitySDK/Assets/ThirdParty/Reaktion/Editor/TiltBrushToolkitThirdPartyEditor.asmdef b/UnitySDK/Assets/ThirdParty/Reaktion/Editor/TiltBrushToolkitThirdPartyEditor.asmdef
new file mode 100644
index 00000000..cb5c2179
--- /dev/null
+++ b/UnitySDK/Assets/ThirdParty/Reaktion/Editor/TiltBrushToolkitThirdPartyEditor.asmdef
@@ -0,0 +1,16 @@
+{
+    "name": "TiltBrushToolkitThirdPartyEditor",
+    "references": [
+        "TiltBrushToolkitThirdParty"
+    ],
+    "optionalUnityReferences": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
+}
\ No newline at end of file
diff --git a/UnitySDK/Assets/ThirdParty/Reaktion/Editor/TiltBrushToolkitThirdPartyEditor.asmdef.meta b/UnitySDK/Assets/ThirdParty/Reaktion/Editor/TiltBrushToolkitThirdPartyEditor.asmdef.meta
new file mode 100644
index 00000000..81d7d48a
--- /dev/null
+++ b/UnitySDK/Assets/ThirdParty/Reaktion/Editor/TiltBrushToolkitThirdPartyEditor.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9a5570e80d5515e468de36b82e536b13
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UnitySDK/Assets/TiltBrush/Scripts/Editor/TiltBrushToolkitEditor.asmdef b/UnitySDK/Assets/TiltBrush/Scripts/Editor/TiltBrushToolkitEditor.asmdef
index 4163bddd..4977f1ae 100644
--- a/UnitySDK/Assets/TiltBrush/Scripts/Editor/TiltBrushToolkitEditor.asmdef
+++ b/UnitySDK/Assets/TiltBrush/Scripts/Editor/TiltBrushToolkitEditor.asmdef
@@ -3,12 +3,14 @@
     "references": [
         "TiltBrushToolkitRuntime"
     ],
-    "optionalUnityReferences": [],
-    "includePlatforms": [],
+    "includePlatforms": [
+        "Editor"
+    ],
     "excludePlatforms": [],
     "allowUnsafeCode": true,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": []
 }
\ No newline at end of file
diff --git a/UnitySDK/ProjectSettings/ProjectVersion.txt b/UnitySDK/ProjectSettings/ProjectVersion.txt
index 9a1eefba..4afedaac 100644
--- a/UnitySDK/ProjectSettings/ProjectVersion.txt
+++ b/UnitySDK/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.4.4f1
+m_EditorVersion: 2018.4.6f1