From 75f269312a4e9d88d6870e3ccfdce415c06d3fa4 Mon Sep 17 00:00:00 2001 From: Unity Technologies <@unity> Date: Wed, 24 Nov 2021 00:00:00 +0000 Subject: [PATCH] com.unity.2d.psdimporter@6.0.2 ## [6.0.2] - 2021-11-24 ### Fixed - Fixed per platform settings does not get applied in Windows platform. (Case 1379970) --- CHANGELOG.md | 4 ++++ Editor/PSDImporter.cs | 4 ++-- package.json | 14 +++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb604d3..f02fd7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [6.0.2] - 2021-11-24 +### Fixed +- Fixed per platform settings does not get applied in Windows platform. (Case 1379970) + ## [6.0.1] - 2021-09-21 ### Fixed - Removed memory requirement check since we cannot properly determine if there will be enough memory to import the file (case 1357544) diff --git a/Editor/PSDImporter.cs b/Editor/PSDImporter.cs index 27866df..8402774 100644 --- a/Editor/PSDImporter.cs +++ b/Editor/PSDImporter.cs @@ -20,7 +20,7 @@ namespace UnityEditor.U2D.PSD /// ScriptedImporter to import Photoshop files /// // Version using unity release + 5 digit padding for future upgrade. Eg 2021.2 -> 21200000 - [ScriptedImporter(21200000, "psb", AllowCaching = true)] + [ScriptedImporter(21200001, "psb", AllowCaching = true)] [HelpURL("https://docs.unity3d.com/Packages/com.unity.2d.psdimporter@latest")] [MovedFrom("UnityEditor.Experimental.AssetImporters")] public class PSDImporter : ScriptedImporter, ISpriteEditorDataProvider @@ -679,7 +679,7 @@ void EnsureSingleSpriteExist() internal TextureImporterPlatformSettings GetPlatformTextureSettings(BuildTarget buildTarget) { - var buildTargetName = TexturePlatformSettingsHelper.GetBuildTargetName(buildTarget); + var buildTargetName = TexturePlatformSettingsHelper.GetBuildTargetGroupName(buildTarget); TextureImporterPlatformSettings platformSettings = null; platformSettings = m_PlatformSettings.SingleOrDefault(x => x.name == buildTargetName && x.overridden == true); platformSettings = platformSettings ?? m_PlatformSettings.SingleOrDefault(x => x.name == TexturePlatformSettingsHelper.defaultPlatformName); diff --git a/package.json b/package.json index e07c86c..b73b95f 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "com.unity.2d.psdimporter", - "version": "6.0.1", + "version": "6.0.2", "unity": "2021.2", "displayName": "2D PSD Importer", - "description": "A ScriptedImporter for importing Adobe Photoshop PSB (Photoshop Big) file format. The ScriptedImporter is currently targeted for users who wants to create multi Sprite character animation using Unity 2D Animation Package.\n\nDocumentation for v5.0 is currently being updated.", + "description": "A ScriptedImporter for importing Adobe Photoshop PSB (Photoshop Big) file format. The ScriptedImporter is currently targeted for users who wants to create multi Sprite character animation using Unity 2D Animation Package.", "keywords": [ "2d", "psdimporter", @@ -11,19 +11,19 @@ ], "category": "2D", "dependencies": { - "com.unity.2d.animation": "7.0.1", - "com.unity.2d.common": "6.0.0", + "com.unity.2d.animation": "7.0.3", + "com.unity.2d.common": "6.0.2", "com.unity.2d.sprite": "1.0.0" }, "relatedPackages": { - "com.unity.2d.psdimporter.tests": "6.0.1" + "com.unity.2d.psdimporter.tests": "6.0.2" }, "upmCi": { - "footprint": "a613628badeb5beba757c208c6433434512ee74d" + "footprint": "ba98f99ccbaa84a993003055774cd003dc4e4a5c" }, "repository": { "url": "https://github.cds.internal.unity3d.com/unity/2d.git", "type": "git", - "revision": "b015022decd440f484d85cf6ee096c0ecaa60e30" + "revision": "890da0579456dc5daa73a5645949c0615fac3d16" } }