Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## Unreleased

### Changes

- [UUM-138539] Removed the pb_ObjectArray file that was deprecated 8 years ago and is not used amymore.

### Fixed

- [UUM-133861] Fixed "Look rotation viewing vector is zero" log being spammed when holding shift while using a create tool such as Create Sprite.
Expand Down
18 changes: 1 addition & 17 deletions Editor/EditorCore/MaterialEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -173,24 +173,8 @@ public static MaterialPalette CurrentPalette
if (s_CurrentPalette != null)
return s_CurrentPalette;

// If no existing pb_MaterialPalette objects in project:
// - create a new one
// - check for the older pb_ObjectArray and copy data to new default
// If no existing pb_MaterialPalette objects in project create a new one
s_CurrentPalette = FileUtility.LoadRequired<MaterialPalette>(s_MaterialPalettePath);

string[] m_LegacyMaterialArrays = AssetDatabase.FindAssets("t:pb_ObjectArray");

for (int i = 0; m_LegacyMaterialArrays != null && i < m_LegacyMaterialArrays.Length; i++)
{
pb_ObjectArray poa = AssetDatabase.LoadAssetAtPath<pb_ObjectArray>(AssetDatabase.GUIDToAssetPath(m_LegacyMaterialArrays[i]));

// Make sure there's actually something worth copying
if (poa != null && poa.array != null && poa.array.Any(x => x != null && x is Material))
{
s_CurrentPalette.array = poa.GetArray<Material>();
break;
}
}
}
return s_CurrentPalette;
}
Expand Down
69 changes: 0 additions & 69 deletions Editor/EditorCore/pb_ObjectArray.cs

This file was deleted.

7 changes: 0 additions & 7 deletions Editor/EditorCore/pb_ObjectArray.cs.meta

This file was deleted.