mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-25 05:40:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix support for sprite assets from Unity <5.2

Browse Source
This commit is contained in:
VaDiM 2024-04-10 10:34:46 +03:00
parent bb7accd04d
commit 6c515aee2e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AssetStudio/Classes/PPtr.cs
View File

@ -58,7 +58,7 @@ namespace AssetStudio
public bool TryGet(out T result, SerializedFile assetsFile = null) public bool TryGet(out T result, SerializedFile assetsFile = null)
{ {
_assetsFile = _assetsFile ?? assetsFile; _assetsFile = _assetsFile ?? assetsFile;
if (TryGetAssetsFile(out var sourceFile)) if (!IsNull && TryGetAssetsFile(out var sourceFile))
{ {
if (sourceFile.ObjectsDic.TryGetValue(m_PathID, out var obj)) if (sourceFile.ObjectsDic.TryGetValue(m_PathID, out var obj))
{ {
@ -77,7 +77,7 @@ namespace AssetStudio
public bool TryGet<T2>(out T2 result, SerializedFile assetsFile = null) where T2 : Object public bool TryGet<T2>(out T2 result, SerializedFile assetsFile = null) where T2 : Object
{ {
_assetsFile = _assetsFile ?? assetsFile; _assetsFile = _assetsFile ?? assetsFile;
if (TryGetAssetsFile(out var sourceFile)) if (!IsNull && TryGetAssetsFile(out var sourceFile))
{ {
if (sourceFile.ObjectsDic.TryGetValue(m_PathID, out var obj)) if (sourceFile.ObjectsDic.TryGetValue(m_PathID, out var obj))
{ {

5
AssetStudio/Classes/Sprite.cs
View File

@ -99,10 +99,7 @@ namespace AssetStudio
var version = reader.version; var version = reader.version;
texture = new PPtr<Texture2D>(reader); texture = new PPtr<Texture2D>(reader);
if (version >= (5, 2)) //5.2 and up alphaTexture = version >= (5, 2) ? new PPtr<Texture2D>(reader) : new PPtr<Texture2D>(); //5.2 and up
{
alphaTexture = new PPtr<Texture2D>(reader);
}
if (version >= 2019) //2019 and up if (version >= 2019) //2019 and up
{ {