Skip to content

Commit

Permalink
2.0.0-preview.3 - 2019/01/29
Browse files Browse the repository at this point in the history
@2019.1
  • Loading branch information
ErikMoczi committed Feb 6, 2019
1 parent a27e9ec commit a9b75fc
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
4 changes: 4 additions & 0 deletions package/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion package/Editor/XRGeneralBuildProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions package/Runtime/XRManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions package/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -17,7 +17,7 @@
"com.unity.subsystemregistration": "1.0.0-preview.4"
},
"repository": {
"revision": "04b722f17ae5109703059245708df47a01fcf73f"
"revision": "c26229d8b86ae1928dcb2c593f81440a06a2c60d"
},
"samples": [
{
Expand Down
1 change: 1 addition & 0 deletions versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
1.0.0-preview.2
2.0.0-preview.1
2.0.0-preview.2
2.0.0-preview.3

0 comments on commit a9b75fc

Please sign in to comment.