diff --git a/package/CHANGELOG.md b/package/CHANGELOG.md index 167ce4cda..0879817f8 100755 --- a/package/CHANGELOG.md +++ b/package/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.0.0-preview.3] - 2019-1-22 +* Fix error in general build processor due to a potential null deref. +* Fix missing check for unity version when referencing UIElements. + ## [2.0.0-preview.2] - 2018-12-19 * Fix package validation issues. * Fix bug due to preinit code that would cause a null ref exception. diff --git a/package/Editor/XRGeneralBuildProcessor.cs b/package/Editor/XRGeneralBuildProcessor.cs index 248648869..dfaa059b1 100755 --- a/package/Editor/XRGeneralBuildProcessor.cs +++ b/package/Editor/XRGeneralBuildProcessor.cs @@ -49,7 +49,7 @@ void CleanOldSettings() where s.GetType() == typeof(XRGeneralSettings) select s; - if (oldSettings.Any()) + if (oldSettings != null && oldSettings.Any()) { var assets = preloadedAssets.ToList(); foreach (var s in oldSettings) diff --git a/package/Runtime/XRManager.cs b/package/Runtime/XRManager.cs index 6bfcececc..60ae9d58b 100755 --- a/package/Runtime/XRManager.cs +++ b/package/Runtime/XRManager.cs @@ -5,7 +5,11 @@ using UnityEditor; using UnityEngine; +#if UNITY_2019_1_OR_NEWER +using UnityEngine.UIElements; +#else using UnityEngine.Experimental.UIElements; +#endif using UnityEngine.Serialization; using UnityEngine.XR.Management; diff --git a/package/package.json b/package/package.json index 986ac5373..5154d9fde 100755 --- a/package/package.json +++ b/package/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.xr.management", "displayName": "XR SDK Management", - "version": "2.0.0-preview.2", + "version": "2.0.0-preview.3", "unity": "2019.1", "description": "Package to provide for simple management of XR SDK loading, unloading and configuration.", "keywords": [ @@ -17,7 +17,7 @@ "com.unity.subsystemregistration": "1.0.0-preview.4" }, "repository": { - "revision": "04b722f17ae5109703059245708df47a01fcf73f" + "revision": "c26229d8b86ae1928dcb2c593f81440a06a2c60d" }, "samples": [ { diff --git a/versions.txt b/versions.txt index d6bf6698f..2a4584a2c 100755 --- a/versions.txt +++ b/versions.txt @@ -21,3 +21,4 @@ 1.0.0-preview.2 2.0.0-preview.1 2.0.0-preview.2 +2.0.0-preview.3