[email protected]

## [3.0.0] - 2019-11-06 ### Changed - Update version number for Unity 2020.1 - Update documentation
needle-mirror · Nov 5, 2019 · bdd6adb · bdd6adb
1 parent 80c5d85
commit bdd6adb
Show file tree

Hide file tree

Showing 18 changed files with 128 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [3.0.0] - 2019-11-06
+### Changed
+- Update version number for Unity 2020.1
+- Update documentation
+
+## [2.0.6] - 2019-10-18
+### Fixed
+- Fixed SpriteRect name clash when Photoshop layer is renamed to the same name as an exisiting user created SpriteRect
+
 ## [2.0.5] - 2019-08-06
 ### Fixed
 - Physics Shape not saved into Sprite when importing with AssetDatabase V2

diff --git a/Documentation~/PSDImporter.md b/Documentation~/PSDImporter.md
diff --git a/Documentation~/images/IncreaseSize.png b/Documentation~/images/IncreaseSize.png
diff --git a/Documentation~/images/LayerGrouping.png b/Documentation~/images/LayerGrouping.png
diff --git a/Documentation~/images/LayerHierarchy.png b/Documentation~/images/LayerHierarchy.png
diff --git a/Documentation~/images/MovedSpriteRect.png b/Documentation~/images/MovedSpriteRect.png
diff --git a/Documentation~/images/OriginalSpriteRect.png b/Documentation~/images/OriginalSpriteRect.png
diff --git a/Documentation~/images/PhotoshopSetup.png b/Documentation~/images/PhotoshopSetup.png
diff --git a/Documentation~/images/SpriteRect1.png b/Documentation~/images/SpriteRect1.png
diff --git a/Documentation~/images/SpriteRect2.png b/Documentation~/images/SpriteRect2.png
diff --git a/Documentation~/images/SpriteRect_following.png b/Documentation~/images/SpriteRect_following.png
diff --git a/Documentation~/images/SpriteRect_table1.png b/Documentation~/images/SpriteRect_table1.png
diff --git a/Documentation~/images/SpriteRect_table2.png b/Documentation~/images/SpriteRect_table2.png
diff --git a/Documentation~/images/propertysettings.png b/Documentation~/images/propertysettings.png
diff --git a/Documentation~/images/table1.png b/Documentation~/images/table1.png
diff --git a/Documentation~/images/table2.png b/Documentation~/images/table2.png
diff --git a/Editor/PSDImporter.cs b/Editor/PSDImporter.cs
@@ -440,6 +440,14 @@ void ImportFromLayers(AssetImportContext ctx, Document doc)
                 {
                     spriteImportData.RemoveAll(x => removedLayersSprite.Contains(x.spriteID));
 
+                    // First look for any user created SpriteRect and add those into the name hash
+                    foreach (var spriteData in spriteImportData)
+                    {
+                        var psdLayer = psdLayers.FirstOrDefault(x => x.spriteID == spriteData.spriteID);
+                        if (psdLayer == null)
+                            spriteNameHash.Add(spriteData.name.GetHashCode());
+                    }
+
                     foreach (var spriteData in spriteImportData)
                     {
                         var psdLayer = psdLayers.FirstOrDefault(x => x.spriteID == spriteData.spriteID);

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "com.unity.2d.psdimporter",
-  "version": "2.0.5",
-  "unity": "2019.3",
-  "unityRelease": "0b3",
+  "version": "3.0.0",
+  "unity": "2020.1",
+  "unityRelease": "0a10",
   "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.",
   "keywords": [
@@ -12,16 +12,16 @@
   ],
   "category": "2D",
   "dependencies": {
-    "com.unity.2d.common": "2.0.2",
-    "com.unity.2d.animation": "3.0.5",
+    "com.unity.2d.common": "3.0.0",
+    "com.unity.2d.animation": "4.0.0",
     "com.unity.2d.sprite": "1.0.0"
   },
   "relatedPackages": {
-    "com.unity.2d.psdimporter.tests": "2.0.5"
+    "com.unity.2d.psdimporter.tests": "3.0.0"
   },
   "repository": {
     "type": "git",
     "url": "[email protected]:unity/2d.git",
-    "revision": "32fbfc4d3040a10e35abd2efee35086c77b66837"
+    "revision": "b8688c8a88e8066298fc5f686b999b70d457883e"
   }
 }