Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
## [2.1.3] - 2020-03-20
### Changed
- Update 2D Animation dependency

## [2.1.2] - 2020-02-27
### Fixed
- Fixed broken documentation links in inspectors
- Fixed empty GameObjects created in certain cases
  • Loading branch information
Unity Technologies committed Mar 19, 2020
1 parent 1732c7f commit 341ce6f
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 9 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [2.1.3] - 2020-03-20
### Changed
- Update 2D Animation dependency

## [2.1.2] - 2020-02-27
### Fixed
- Fixed broken documentation links in inspectors
- Fixed empty GameObjects created in certain cases

## [2.1.0] - 2019-12-16
### Added
- Expose PSDImporter class to be accessible via scripting
Expand Down
3 changes: 2 additions & 1 deletion Editor/PSDImporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ namespace UnityEditor.U2D.PSD
/// ScriptedImporter to import Photoshop files
/// </summary>
[ScriptedImporter(4, "psb")]
[HelpURL("https://docs.unity3d.com/Packages/[email protected]/manual/index.html")]
public class PSDImporter : ScriptedImporter, ISpriteEditorDataProvider
{
class GameObjectCreationFactory
Expand Down Expand Up @@ -639,7 +640,7 @@ void BuildGroupGameObject(List<PSDLayer> psdGroup, int index, Transform root)
var spriteData = GetSpriteImportData().FirstOrDefault(x => x.spriteID == psdGroup[index].spriteID);
if (psdGroup[index].gameObject == null)
{
if (m_GenerateGOHierarchy || !psdGroup[index].spriteID.Empty())
if (m_GenerateGOHierarchy || (!psdGroup[index].spriteID.Empty() && psdGroup[index].isGroup == false))
{
// Determine if need to create GameObject i.e. if the sprite is not in a SpriteLib or if it is the first one
string categoryName;
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
com.unity.2d.psdimporter copyright © 2019 Unity Technologies ApS
com.unity.2d.psdimporter copyright © 2020 Unity Technologies ApS

Unity hereby grants to you a worldwide, non-exclusive, no-charge, and royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute the software that is made available with this License ("**_Software_**"), subject to the following terms and conditions:

Expand Down
2 changes: 1 addition & 1 deletion Tests/EditorTests/PlaceholderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace UnityEditor.Experimental.U2D.PSDImporter.Tests
{
public class Placeholder
internal class Placeholder
{
[Test]
public void PlaceHolderTest()
Expand Down
4 changes: 3 additions & 1 deletion Tests/EditorTests/Unity.2D.Psdimporter.EditorTests.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"defineConstraints": [
"UNITY_INCLUDE_TESTS"
],
"versionDefines": []
}
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.unity.2d.psdimporter",
"version": "2.1.0",
"version": "2.1.3",
"unity": "2019.3",
"unityRelease": "0b11",
"displayName": "2D PSD Importer",
Expand All @@ -13,15 +13,16 @@
"category": "2D",
"dependencies": {
"com.unity.2d.common": "2.0.2",
"com.unity.2d.animation": "3.1.0",
"com.unity.2d.animation": "3.2.1",
"com.unity.2d.sprite": "1.0.0"
},
"relatedPackages": {
"com.unity.2d.psdimporter.tests": "2.1.0"
"com.unity.2d.psdimporter.tests": "2.1.2"
},
"repository": {
"footprint": "32ca6d84b652c02ecea51af3169de4e171bfaa65",
"type": "git",
"url": "git@github.cds.internal.unity3d.com:unity/2d.git",
"revision": "27d34c0b0f3c6341786dccdec9131bb32be78194"
"url": "https://github.cds.internal.unity3d.com/unity/2d.git",
"revision": "fe91531ce08a1393a8bdfcd5344b47d2279e33c1"
}
}

0 comments on commit 341ce6f

Please sign in to comment.