Merge pull request #8822 from microsoft/releases/2.5.1

Releases/2.5.1

Author: David Kline

Assets/MRTK/Core/Extensions/TypeExtensions.cs

@@ -27,7 +27,7 @@ public static List<Type> GetAllSubClassesOf(this Type rootType, Assembly[] searc
 
             Parallel.ForEach(searchAssemblies, (assembly) =>
             {
-                Parallel.ForEach(assembly.GetTypes(), (type) =>
+                Parallel.ForEach(assembly.GetLoadableTypes(), (type) =>
                 {
                     if (type != null && type.IsClass && !type.IsAbstract && type.IsSubclassOf(rootType))
                     {

Assets/MRTK/Core/Inspectors/Profiles/DataProviderAccessServiceInspector.cs

@@ -167,6 +167,7 @@ protected bool RenderDataProviderEntry(int index, GUIContent removeContent, Syst
             {
                 using (new EditorGUILayout.HorizontalScope())
                 {
+                    if (index < 0 || index >= providerFoldouts.Count) index = 0;
                     providerFoldouts[index] = EditorGUILayout.Foldout(providerFoldouts[index], providerProperties.componentName.stringValue, true);
 
                     if (GUILayout.Button(removeContent, EditorStyles.miniButtonRight, GUILayout.Width(24f)))

Assets/MRTK/Core/Inspectors/Profiles/MixedRealitySceneSystemProfileInspector.cs

@@ -19,13 +19,16 @@ public class MixedRealitySceneSystemProfileInspector : BaseMixedRealityToolkitCo
         const float DragAreaOffset = 10;
         const float LightingSceneTypesLabelWidth = 45;
 
-        private static string managerSceneContent =
-            "The Manager scene is loaded first and remains loaded for the duration of the app. Only one Manager scene is ever loaded, and no scene operation will ever unload it.";
+        private const string defaultSceneContent =
+            "Default scene system resources were not found.\nIf using custom manager and lighting scenes, this message can be ignored.\nIf not, please see the documentation for more information";
 
-        private static string lightingSceneContent =
-            "The Lighting scene controls lighting settings such as ambient light, skybox and sun direction. A Lighting scene's content is restricted based on the types defined in your editor settings. A default lighting scene is loaded on initialization. Only one lighting scene will ever be loaded at a time.";
+        private const string managerSceneContent =
+            "The manager scene is loaded first and remains loaded for the duration of the app. Only one manager scene is ever loaded, and no scene operation will ever unload it.";
 
-        private static string contentSceneContent =
+        private const string lightingSceneContent =
+            "The lighting scene controls lighting settings such as ambient light, skybox and sun direction. A lighting scene's content is restricted based on the types defined in your editor settings. A default lighting scene is loaded on initialization. Only one lighting scene will ever be loaded at a time.";
+
+        private const string contentSceneContent =
             "Content scenes are everything else. You can load and unload any number of content scenes in any combination, and their content is unrestricted.";
 
         private static bool showEditorProperties = true;
@@ -98,6 +101,11 @@ public override void OnInspectorGUI()
 
             MixedRealitySceneSystemProfile profile = (MixedRealitySceneSystemProfile)target;
 
+            if (!FindDefaultResources())
+            {
+                EditorGUILayout.HelpBox(defaultSceneContent, MessageType.Info);
+            }
+
             RenderFoldout(ref showEditorProperties, "Editor Settings", () =>
             {
                 using (new EditorGUI.IndentLevelScope())
@@ -311,5 +319,24 @@ private void DrawContentSceneElement(Rect rect, int index, bool isActive, bool i
         {
             SceneInfoDrawer.DrawProperty(rect, contentScenes.GetArrayElementAtIndex(index), GUIContent.none, isActive, isFocused);
         }
+
+        private const string defaultManagerAssetGuid = "ae7bb08d297fb69408695d8de0962524";
+        private Object defaultManagerAsset = null;
+        private const string defaultLightingAssetGuid = "7e54e36c44f826c438c95da79f8de638";
+        private Object defaultLightingAsset = null;
+
+        private bool FindDefaultResources()
+        {
+            if ((defaultManagerAsset != null) &&
+                (defaultLightingAsset != null))
+            {
+                return true;
+            }
+
+            defaultManagerAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(AssetDatabase.GUIDToAssetPath(defaultManagerAssetGuid));
+            defaultLightingAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(AssetDatabase.GUIDToAssetPath(defaultLightingAssetGuid));
+
+            return ((defaultManagerAsset != null) && (defaultLightingAsset != null));
+        }
     }
 }

Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetSelections/Models/Model_Bucky.fbx.meta

@@ -4751,7 +4751,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1296537308}
-  m_Mesh: {fileID: 4300000, guid: da9fdd3f838df944bacc62655d5f4c0b, type: 3}
+  m_Mesh: {fileID: 4300000, guid: bb88669a3463b36438d9225a3ecd3a35, type: 3}
 --- !u!23 &1296537315
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetSelections/Models/Model_Icosa.fbx.meta

@@ -44,7 +44,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 406701532}
-  m_Mesh: {fileID: 4300000, guid: 78caa72370473f3419cf71dc0206fb0b, type: 3}
+  m_Mesh: {fileID: 4300000, guid: 24d47aad909b7114f99ea8657d2883d8, type: 3}
 --- !u!23 &406701539
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetSelections/Prefabs/TargetType (1).prefab

@@ -44,7 +44,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1026199801}
-  m_Mesh: {fileID: 4300000, guid: da9fdd3f838df944bacc62655d5f4c0b, type: 3}
+  m_Mesh: {fileID: 4300000, guid: bb88669a3463b36438d9225a3ecd3a35, type: 3}
 --- !u!23 &7053860045126866416
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetSelections/Prefabs/TargetType (2).prefab

@@ -44,7 +44,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1267695655}
-  m_Mesh: {fileID: 4300000, guid: 78caa72370473f3419cf71dc0206fb0b, type: 3}
+  m_Mesh: {fileID: 4300000, guid: 24d47aad909b7114f99ea8657d2883d8, type: 3}
 --- !u!23 &1103202623642251569
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetSelections/Prefabs/TargetType (3).prefab

@@ -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