Merge pull request #8780 from davidkline-ms/tidyUp

Tidy up some small mistakes in recent asset changes in the 2.5.1 branch

Author: David Kline

Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-00-RootScene.unity

@@ -5977,7 +5977,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1432708682}
-  m_Mesh: {fileID: 4300000, guid: da9fdd3f838df944bacc62655d5f4c0b, type: 3}
+  m_Mesh: {fileID: 4300000, guid: bb88669a3463b36438d9225a3ecd3a35, type: 3}
 --- !u!23 &1432708725
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -7443,7 +7443,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 118407341654888515}
-  m_Mesh: {fileID: 4300000, guid: 78caa72370473f3419cf71dc0206fb0b, type: 3}
+  m_Mesh: {fileID: 4300000, guid: 24d47aad909b7114f99ea8657d2883d8, type: 3}
 --- !u!23 &118407341654888572
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -19792,7 +19792,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4694138267948785252}
-  m_Mesh: {fileID: 4300000, guid: da9fdd3f838df944bacc62655d5f4c0b, type: 3}
+  m_Mesh: {fileID: 4300000, guid: bb88669a3463b36438d9225a3ecd3a35, type: 3}
 --- !u!1 &4694138267948785252
 GameObject:
   m_ObjectHideFlags: 0
@@ -21468,7 +21468,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7464439473353893257}
-  m_Mesh: {fileID: 4300000, guid: 78caa72370473f3419cf71dc0206fb0b, type: 3}
+  m_Mesh: {fileID: 4300000, guid: 24d47aad909b7114f99ea8657d2883d8, type: 3}
 --- !u!23 &7464439473353893302
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/MRTK/SDK/Features/UX/Scripts/UnityUI/ColorChangerUnityUI.cs

@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Microsoft.MixedReality.Toolkit.Examples.Demos
+namespace Microsoft.MixedReality.Toolkit.UI
 {
     /// <summary>
     /// Change the color of the material on a UnityUI Graphic (ex. Image).  Useful for visualizing button presses.

Assets/MRTK/SceneSystemResources.meta …es/SceneSystem/SceneSystemResources.metaAssets/MRTK/SceneSystemResources.meta renamed to Assets/MRTK/Services/SceneSystem/SceneSystemResources.meta Assets/MRTK/SceneSystemResources.meta renamed to Assets/MRTK/Services/SceneSystem/SceneSystemResources.meta

@@ -34,5 +34,11 @@
         "package.json.meta",
         "Samples~"
     ],
-    %samples%
+    "samples": [
+        {
+          "displayName": "Scene System Resources",
+          "description": "Resources used by the MRTK Scene System",
+          "path": "Samples~/SceneSystemResources"
+        }
+    ]
 }

…stemResources/DefaultLightingScene.unity …stemResources/DefaultLightingScene.unityAssets/MRTK/SceneSystemResources/DefaultLightingScene.unity renamed to Assets/MRTK/Services/SceneSystem/SceneSystemResources/DefaultLightingScene.unity Assets/MRTK/SceneSystemResources/DefaultLightingScene.unity renamed to Assets/MRTK/Services/SceneSystem/SceneSystemResources/DefaultLightingScene.unity

@@ -44,7 +44,7 @@ If the SceneSystemResources folder has been deleted, or was deselected during im
 
 - Select **Assets** > **Import Package** > **Custom Package**
 - Open the **Microsoft.MixedReality.Toolkit.Foundation** package
-- Ensure that **SceneSystemResources** and all child options are selected
+- Ensure that **Services/SceneSystem/SceneSystemResources** and all child options are selected
 
   ![Reimport scene system resources](../Images/SceneSystem/ReimportSceneSystemResources.png)