File tree Expand file tree Collapse file tree 1 file changed +8
-3
lines changed
Assets/VRTK/Source/Scripts/Utilities Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -789,13 +789,13 @@ private static IEnumerable<T> FindEvenInactiveComponentsInValidScenes<T>(bool se
789
789
List < T > allSceneResults = new List < T > ( ) ;
790
790
for ( int sceneIndex = 0 ; sceneIndex < SceneManager . sceneCount ; sceneIndex ++ )
791
791
{
792
- allSceneResults . AddRange ( FindEventInactiveComponentsInScene < T > ( SceneManager . GetSceneAt ( sceneIndex ) , stopOnMatch ) ) ;
792
+ allSceneResults . AddRange ( FindEvenInactiveComponentsInScene < T > ( SceneManager . GetSceneAt ( sceneIndex ) , stopOnMatch ) ) ;
793
793
}
794
794
results = allSceneResults ;
795
795
}
796
796
else
797
797
{
798
- results = FindEventInactiveComponentsInScene < T > ( SceneManager . GetActiveScene ( ) , stopOnMatch ) ;
798
+ results = FindEvenInactiveComponentsInScene < T > ( SceneManager . GetActiveScene ( ) , stopOnMatch ) ;
799
799
}
800
800
801
801
return results ;
@@ -807,9 +807,14 @@ private static IEnumerable<T> FindEvenInactiveComponentsInValidScenes<T>(bool se
807
807
/// <param name="scene">The scene to search. This scene must be valid, either loaded or loading.</param>
808
808
/// <param name="stopOnMatch">If true, will stop searching objects as soon as a match is found.</param>
809
809
/// <returns></returns>
810
- private static IEnumerable < T > FindEventInactiveComponentsInScene < T > ( Scene scene , bool stopOnMatch = false )
810
+ private static IEnumerable < T > FindEvenInactiveComponentsInScene < T > ( Scene scene , bool stopOnMatch = false )
811
811
{
812
812
List < T > results = new List < T > ( ) ;
813
+ if ( ! scene . isLoaded )
814
+ {
815
+ return results ;
816
+ }
817
+
813
818
foreach ( GameObject rootObject in scene . GetRootGameObjects ( ) )
814
819
{
815
820
if ( stopOnMatch )
You can’t perform that action at this time.
0 commit comments