Merge pull request #1035 from Microsoft/revert-1033-Dev_Unity_2017.2.0

StephenHodgson · web-flow · commit 3dea86a27aa9 · 2017-09-27T16:16:54.000-07:00
Revert "Instance isn't found if class is on a disabled GameObject."
diff --git a/Assets/HoloToolkit/Utilities/Scripts/SingleInstance.cs b/Assets/HoloToolkit/Utilities/Scripts/SingleInstance.cs
@@ -18,7 +18,7 @@ public static T Instance
             {
                 if (_Instance == null)
                 {
-                    T[] objects = Resources.FindObjectsOfTypeAll<T>();
+                    T[] objects = FindObjectsOfType<T>();
                     if (objects.Length != 1)
                     {
                         Debug.LogErrorFormat("Expected exactly 1 {0} but found {1}", typeof(T).ToString(), objects.Length);

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static T Instance`
`18`	`18`	`{`
`19`	`19`	`if (_Instance == null)`
`20`	`20`	`{`
`21`		`- T[] objects = Resources.FindObjectsOfTypeAll<T>();`
	`21`	`+ T[] objects = FindObjectsOfType<T>();`
`22`	`22`	`if (objects.Length != 1)`
`23`	`23`	`{`
`24`	`24`	`Debug.LogErrorFormat("Expected exactly 1 {0} but found {1}", typeof(T).ToString(), objects.Length);`