Merge pull request #387 from CesiumGS/find-server-better

Use AssetDatabase.LoadAssetAtPath instead of Resources.Load in Editor
CesiumGS · Dec 14, 2023 · caf2554 · caf2554
2 parents 09dc984 + 7606c4a
commit caf2554
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,11 @@
 # Change Log
 
+### v1.7.1 - 2023-12-14
+
+##### Fixes :wrench:
+
+- Fixed a bug that prevented the default `CesiumIonServer` asset from remembering its token in a clean project.
+
 ### v1.7.0 - 2023-12-14
 
 ##### Additions :tada:

diff --git a/Runtime/CesiumIonServer.cs b/Runtime/CesiumIonServer.cs
@@ -65,7 +65,13 @@ public static CesiumIonServer defaultServer
         {
             get
             {
+#if UNITY_EDITOR
+                CesiumIonServer result = AssetDatabase.LoadAssetAtPath(
+                    "Assets/CesiumSettings/Resources/CesiumIonServers/ion.cesium.com.asset",
+                    typeof(CesiumIonServer)) as CesiumIonServer;
+#else
                 CesiumIonServer result = Resources.Load<CesiumIonServer>("CesiumIonServers/ion.cesium.com");
+#endif
 
 #if UNITY_EDITOR
                 if (result == null)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.cesium.unity",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "displayName": "Cesium for Unity",
   "description": "Cesium for Unity brings the 3D geospatial ecosystem to Unity. By combining a high-accuracy full-scale WGS84 globe, open APIs and open standards for spatial indexing such as 3D Tiles, and cloud-based real-world content from [Cesium ion](https://cesium.com/cesium-ion) with Unity, this plugin enables 3D geospatial workflows and applications in Unity.",
   "license": "Apache-2.0",