[email protected]

## [6.0.0-pre.4] - 2021-07-05 ### Fixed - Fixed changing PSD Importer inspector fields causes UnityEditor.ObjectPreview errors (case 1333823) - Fixed 2D PSDImporter always imports .psb files when switching build platforms (case 1327701) - Fixed 2D PSDImporter doesn't apply settings from Sprite Editor Window when changes made in Inspector (case 1339799)
needle-mirror · Jul 5, 2021 · 8c9c21c · 8c9c21c
1 parent 6b52a46
commit 8c9c21c
Show file tree

Hide file tree

Showing 39 changed files with 884 additions and 460 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [6.0.0-pre.4] - 2021-07-05
+### Fixed
+- Fixed changing PSD Importer inspector fields causes UnityEditor.ObjectPreview errors (case 1333823)
+- Fixed 2D PSDImporter always imports .psb files when switching build platforms (case 1327701)
+- Fixed 2D PSDImporter doesn't apply settings from Sprite Editor Window when changes made in Inspector (case 1339799)
+
 ## [6.0.0-pre.3] - 2021-05-17
 ### Changed
 - Update dependency version
@@ -8,6 +14,7 @@
 ### Changed
 - Update dependency version
 
+
 ## [6.0.0-pre.1] - 2021-05-05
 ### Changed
 - Version bump for Unity 2021.2

diff --git a/Documentation~/PSD-importer-SpriteRect.md b/Documentation~/PSD-importer-SpriteRect.md
@@ -1,15 +1,15 @@
 # How the PSD Importer uses SpriteRect data
-The PSD Importer can store five separate sets of[ SpriteRect](https://docs.unity3d.com/ScriptReference/Sprite-rect.html) data, with one set for each of the five combinations of Importer property settings below:
-   1. When [**Sprite Mode**](PSD-importer-properties.md#SpriteMode) is set to **Single**.
+The PSD Importer can store five separate sets of[ SpriteRect](https://docs.unity3d.com/Packages/[email protected]/api/UnityEditor.SpriteRect.html) data, with one set for each of the five combinations of Importer property settings below:
+   1. When [Sprite Mode](PSD-importer-properties.html#SpriteMode) is set to **Single**.
    2. When **Sprite Mode** is set to **Multiple**.
-   3. When **Sprite Mode** is set to **Multiple,** and [**Mosaic**](PSD-importer-properties.md#Mosaic) is enabled.
-   4. When **Sprite Mode** is set to **Multiple**, both **Mosaic** and [**Character Rig**](PSD-importer-properties.md#character-rig) are enabled, and there is no [Skeleton Asset](PSD-importer-properties.md#main-skeleton) assigned as the [**Main Skeleton**](PSD-importer-properties.md#main-skeleton).
-   5. When **Sprite Mode** is set to **Multiple**, both **Mosaic** and **Character Rig** are enabled, and a Skeleton Asset is assigned as the **Main Skeleton**.
+   3. When **Sprite Mode** is set to **Multiple,** and [Individual Sprites (Mosaic)](PSD-importer-properties.html#Mosaic) is enabled.
+   4. When **Sprite Mode** is set to **Multiple**, both **Individual Sprites (Mosaic)** and [Use as Rig](PSD-importer-properties.html#use-as-rig) are enabled, and there is no [Skeleton Asset](PSD-importer-properties.html#main-skeleton) assigned as the [Main Skeleton](PSD-importer-properties.html#main-skeleton).
+   5. When **Sprite Mode** is set to **Multiple**, both **Individual Sprites (Mosaic)** and **Use as Rig** are enabled, and a Skeleton Asset is assigned as the **Main Skeleton**.
 
 Each set of data is persistent, and does not affect or overwrite the data of other sets. This means you can save different SpriteRect data for different importer settings for the same source file. The SpriteRect data persists even if you modify the dimensions and position of images in the source file, as long as the original [Layer ID](https://github.com/adobe-photoshop/generator-core/wiki/Understanding-Layer-IDs-and-Layer-Indices) of the source layers remains the same.
 
-## Modifying the SpriteRect data
-The SpriteRect defines the location of the Sprite on the Texture that Unity generates from the imported source file. You can modify the location and size of each SpriteRect in the Sprite Editor.  SpriteRect data persists until you manually delete the SpriteRect, or select the **Reslice** option and apply it in the importer settings. When you do this, Unity discards all user modifications for the current set of SpriteRect data and regenerates all the SpriteRects from the current source file.
+## Modifying SpriteRect data
+The SpriteRect defines the location of the Sprite on the Texture that Unity generates from the imported source file. You can modify the location and size of each SpriteRect in the Sprite Editor.
 
 ### Moving the SpriteRect
 
@@ -24,28 +24,28 @@ A SpriteRect’s modified dimensions and location on the Texture is reflected fo
 | Original character prefab and its ‘head’ Sprite with unmodified SpriteRect data. | Character prefab with its ‘head’ Sprite’s SpriteRect data modified.|
 
 ### SpriteRect follows the position of its source layer
-When you enable the [Mosaic](PSD-importer-properties.md#Mosaic) importer setting, the PSD Importer arranges the different layers of the source file together to form a single combined Texture when you import it. The importer generates a SpriteRect for each of these imported layers, and follows the position of its associated layer wherever it is placed in the Mosaic Texture.
+When you enable the [Individual Sprites (Mosaic)](PSD-importer-properties.html#IndiSpriteMosaic) importer setting, the PSD Importer arranges the different layers of the source file together to form a single combined Texture when it is imported. The importer generates a SpriteRect for each of these imported layers which follows the position of its associated layer wherever that layer is placed in the combined Mosaic Texture.
 
 ![](images/21_2-Fei-SpriteRect-head-moved.png)<br/>Before example: The SpriteRect of the ‘head’ layer after moving its SpriteRect from its original position.
 
-![](images/21_2-Fei-SpriteRect-head-moved-hidden.png)<br/>After hiding some of the layers in the source file and reimporting it, the resulting Mosaic Texture is different from the original. However, the SpriteRect follows the ‘head’ layer’s placement in the new Texture.
+![](images/21_2-Fei-SpriteRect-head-moved-hidden.png)<br/>After example: Some of the layers are hidden in the source file before it is reimported into the Editor. The reimported Texture is different from the original, but the 'head' layer's SpriteRect follows its source layer to its placement in the new Texture.
 
 ### Resizing the source file or image
-A SpriteRect’s size and position remains the same if you change the image or canvas size of its source layer in the source file. You must manually edit the size and position of the SpriteRect in the Sprite Editor, or select and apply the [Reslice](PSD-importer-properties.md#reslice) option to regenerate the SpriteRect completely from the source file.
+Note that a SpriteRect’s size and position remains the same if you change the image or canvas size of its source layer in the source file. You must manually edit the size and position of the SpriteRect in the Sprite Editor, or select and apply the [Automatic Reslice](PSD-importer-properties.html#automatic-reslice) option to regenerate the SpriteRect completely from the source file.
 
 ![](images/21_2-Fei-SpriteRect-head-original.png)<br/>Before example: Original position and size of the SpriteRect for the generated ‘head’ Sprite from the 'head' layer.
 
 ![](images/21_2-Fei-SpriteRect-head-resized.png)<br/>After example: After increasing the size of the 'head' layer, the SpriteRect's position and size remains the same.
 
-SpriteRect data persists until you manually delete the SpriteRect, or select the **Reslice** option and apply it in the importer settings. When you do this, Unity discards all user modifications for the current set of SpriteRect data and regenerates all the SpriteRects from the current source file.
+SpriteRect data persists until you manually delete the SpriteRect, or select the **Automatic Reslice** option and apply it in the importer settings. When you do this, Unity discards all user modifications for the current set of SpriteRect data and regenerates all the SpriteRects from the current source file.
 
 ## Summary of source file modifications and their effects on SpriteRect data
 | __Modification to the source file__             | __Effect on SpriteRect data__                                |
 | ----------------------------------------------- | ------------------------------------------------------------ |
 | __Add a new layer or enable layer visibility__ | The PSD importer automatically generates a new Sprite from the new layer, or newly visible layer, with its associated SpriteRect. |
 | __Delete a layer or disable layer visibility__  | The PSD Importer deletes the associated Sprite and SpriteRect from the Project file. |
 | __Rename a layer__                            | By default, the SpriteRect copies the new name of its source layer. However if you rename the SpriteRect in the Sprite Editor, then it retains its modified name and does not copy the source layer’s new name. |
-| __Change a layer or canvas size__                | When a source layer's size changes, the size and position of its related SpriteRect remain the same and do not reflect the changes made to its source layer. </br>To make the SpriteRect reflect the changes made to its source layer, manually edit the SpriteRect’s dimensions in the Sprite Editor, or go to the PSD Importer settings and select and apply the [Reslice](#Reslice) option. |
+| __Change a layer or canvas size__                | When a source layer's size changes, the size and position of its related SpriteRect remain the same and do not reflect the changes made to its source layer. </br>To make the SpriteRect reflect the changes made to its source layer, manually edit the SpriteRect’s dimensions in the Sprite Editor, or go to the PSD Importer settings and select and apply the **Automatic Reslice** option. |
 
 
 ## Name collision errors