Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
## [6.0.2] - 2021-11-24
### Fixed
- Fixed per platform settings does not get applied in Windows platform. (Case 1379970)
  • Loading branch information
Unity Technologies committed Nov 24, 2021
1 parent 80b0b15 commit 75f2693
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Editor/PSDImporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace UnityEditor.U2D.PSD
/// ScriptedImporter to import Photoshop files
/// </summary>
// 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
Expand Down Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
"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",
"assetimporter"
],
"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"
}
}

0 comments on commit 75f2693

Please sign in to comment.