Skip to content

Commit 0822c17

Browse files
committed
Fix uneccesary use of generics in LoadOrCreateInstance, the T is inherited from the class definition, the T is inherited from the class definition
1 parent ba82f47 commit 0822c17

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

Scripts/Editor/Utils/CollectionUtility.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private static void CreateNewItem()
2525
[MenuItem("Assets/Create/ScriptableObject Collection/Create Settings", false, 200)]
2626
private static void CreateSettings()
2727
{
28-
ScriptableObjectCollectionSettings.LoadOrCreateInstance<ScriptableObjectCollection>();
28+
ScriptableObjectCollectionSettings.LoadOrCreateInstance();
2929
}
3030

3131

Scripts/Runtime/CollectionsRegistry.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class CollectionsRegistry : ResourceScriptableObjectSingleton<Collections
1515

1616
public void UsedOnlyForAOTCodeGeneration()
1717
{
18-
LoadOrCreateInstance<CollectionsRegistry>();
18+
LoadOrCreateInstance();
1919
// Include an exception so we can be sure to know if this method is ever called.
2020
throw new InvalidOperationException("This method is used for AOT code generation only. Do not call it at runtime.");
2121
}

Scripts/Runtime/ResourceScriptableObjectSingleton.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ public static T Instance
1111
get
1212
{
1313
if (instance == null)
14-
instance = LoadOrCreateInstance<T>();
14+
instance = LoadOrCreateInstance();
1515
return instance;
1616
}
1717
}
1818

1919
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
20-
public static T LoadOrCreateInstance<T>() where T : ScriptableObject
20+
public static T LoadOrCreateInstance()
2121
{
2222
T newInstance = Resources.Load<T>(typeof(T).Name);
2323

0 commit comments

Comments
 (0)