From 6c515aee2e3a5c5c774bec33e9f57ddd24650a8b Mon Sep 17 00:00:00 2001 From: VaDiM Date: Wed, 10 Apr 2024 10:34:46 +0300 Subject: [PATCH] Fix support for sprite assets from Unity <5.2 --- AssetStudio/Classes/PPtr.cs | 4 ++-- AssetStudio/Classes/Sprite.cs | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/AssetStudio/Classes/PPtr.cs b/AssetStudio/Classes/PPtr.cs index 6466a42..9bec685 100644 --- a/AssetStudio/Classes/PPtr.cs +++ b/AssetStudio/Classes/PPtr.cs @@ -58,7 +58,7 @@ namespace AssetStudio public bool TryGet(out T result, SerializedFile assetsFile = null) { _assetsFile = _assetsFile ?? assetsFile; - if (TryGetAssetsFile(out var sourceFile)) + if (!IsNull && TryGetAssetsFile(out var sourceFile)) { if (sourceFile.ObjectsDic.TryGetValue(m_PathID, out var obj)) { @@ -77,7 +77,7 @@ namespace AssetStudio public bool TryGet(out T2 result, SerializedFile assetsFile = null) where T2 : Object { _assetsFile = _assetsFile ?? assetsFile; - if (TryGetAssetsFile(out var sourceFile)) + if (!IsNull && TryGetAssetsFile(out var sourceFile)) { if (sourceFile.ObjectsDic.TryGetValue(m_PathID, out var obj)) { diff --git a/AssetStudio/Classes/Sprite.cs b/AssetStudio/Classes/Sprite.cs index 6f5eaa4..2ca4846 100644 --- a/AssetStudio/Classes/Sprite.cs +++ b/AssetStudio/Classes/Sprite.cs @@ -99,10 +99,7 @@ namespace AssetStudio var version = reader.version; texture = new PPtr(reader); - if (version >= (5, 2)) //5.2 and up - { - alphaTexture = new PPtr(reader); - } + alphaTexture = version >= (5, 2) ? new PPtr(reader) : new PPtr(); //5.2 and up if (version >= 2019) //2019 and up {