-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## [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
Showing
6 changed files
with
22 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters