Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
## [4.1.3] - 2021-11-22
### Fixed
- Fixed per platform settings does not get applied in Windows platform. (Case 1379969)
  • Loading branch information
Unity Technologies committed Nov 22, 2021
1 parent 8161d7d commit b649f6f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## [4.1.3] - 2021-11-22
### Fixed
- Fixed per platform settings does not get applied in Windows platform. (Case 1379969)


## [4.1.2] - 2021-10-11
### Fixed
- Fixed artifacts on images when flatten.
Expand Down
4 changes: 2 additions & 2 deletions Editor/PSDImporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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(20300000, "psb", AllowCaching = true)]
[ScriptedImporter(20300001, "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 @@ -591,7 +591,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
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.unity.2d.psdimporter",
"version": "4.1.2",
"version": "4.1.3",
"unity": "2020.3",
"unityRelease": "9f1",
"displayName": "2D PSD Importer",
Expand All @@ -12,19 +12,19 @@
],
"category": "2D",
"dependencies": {
"com.unity.2d.common": "4.0.3",
"com.unity.2d.animation": "5.0.9",
"com.unity.2d.common": "4.0.4",
"com.unity.2d.animation": "5.0.10",
"com.unity.2d.sprite": "1.0.0"
},
"relatedPackages": {
"com.unity.2d.psdimporter.tests": "4.1.2"
"com.unity.2d.psdimporter.tests": "4.1.3"
},
"upmCi": {
"footprint": "cfa9c807b576ccbafc70cbee10a358dafbd8200d"
"footprint": "20b255c3acf899002acc4b03d720c50fd0707001"
},
"repository": {
"url": "https://github.cds.internal.unity3d.com/unity/2d.git",
"type": "git",
"revision": "66590de9de7c21359f721ef05db04d7f1753bde9"
"revision": "341b7316671d7e6703a7627f67c5fab262c4f1ac"
}
}

0 comments on commit b649f6f

Please sign in to comment.