com.wallstop-studios.unity-helpers 2.0.0-rc75.5 → 2.0.0-rc75.7

package/Editor/Sprites/SpriteCropper.cs

@@ -180,6 +180,7 @@
                 return;
             }
 
+            List<string> needReprocessing = new();
             string lastProcessed = null;
             try
             {
@@ -224,6 +225,10 @@
                         {
                             newImporters.Add(newImporter);
                         }
+                        else
+                        {
+                            needReprocessing.Add(file);
+                        }
                     }
                 }
                 finally
@@ -237,6 +242,33 @@
                     AssetDatabase.Refresh();
                 }
 
+                if (needReprocessing.Any())
+                {
+                    newImporters.Clear();
+                    AssetDatabase.StartAssetEditing();
+                    try
+                    {
+                        foreach (string file in needReprocessing)
+                        {
+                            TextureImporter newImporter = ProcessSprite(file);
+                            if (newImporter != null)
+                            {
+                                newImporters.Add(newImporter);
+                            }
+                        }
+                    }
+                    finally
+                    {
+                        AssetDatabase.StopAssetEditing();
+                        foreach (TextureImporter newImporter in newImporters)
+                        {
+                            newImporter.SaveAndReimport();
+                        }
+                        AssetDatabase.SaveAssets();
+                        AssetDatabase.Refresh();
+                    }
+                }
+
                 this.Log($"{newImporters.Count} sprites processed successfully.");
             }
             catch (Exception e)

package/Editor/Sprites/SpriteSettingsApplier.cs

@@ -559,7 +559,6 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 return;
             }
 
-            List<TextureImporter> importers = new();
             AssetDatabase.StartAssetEditing();
             try
             {
@@ -580,33 +579,12 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                         }
                     }
                 }
-
-                for (int i = 0; i < updatedImporters.Count; i++)
-                {
-                    TextureImporter importer = updatedImporters[i];
-                    EditorUtility.DisplayProgressBar(
-                        "Updating Sprite Settings",
-                        $"Processing '{Path.GetFileName(importer.assetPath)}' ({i + 1}/{updatedImporters.Count})",
-                        (float)(i + 1) / updatedImporters.Count
-                    );
-                    try
-                    {
-                        importer.SaveAndReimport();
-                        importers.Add(importer);
-                    }
-                    catch (Exception ex)
-                    {
-                        this.LogError(
-                            $"Failed to save and reimport asset '{importer.assetPath}': {ex.Message}"
-                        );
-                    }
-                }
             }
             finally
             {
                 AssetDatabase.StopAssetEditing();
                 EditorUtility.ClearProgressBar();
-                foreach (TextureImporter importer in importers)
+                foreach (TextureImporter importer in updatedImporters)
                 {
                     importer.SaveAndReimport();
                 }
@@ -778,6 +756,21 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             TextureImporterSettings settings = new();
             textureImporter.ReadTextureSettings(settings);
 
+            if (spriteData.applySpriteMode)
+            {
+                if (textureImporter.spriteImportMode != spriteData.spriteMode)
+                {
+                    textureImporter.spriteImportMode = spriteData.spriteMode;
+                    changed = true;
+                }
+
+                if (settings.spriteMode != (int)spriteData.spriteMode)
+                {
+                    settings.spriteMode = (int)spriteData.spriteMode;
+                    settingsChanged = true;
+                }
+            }
+
             if (spriteData.applyPixelsPerUnit)
             {
                 if (textureImporter.spritePixelsPerUnit != spriteData.pixelsPerUnit)
@@ -785,6 +778,12 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                     textureImporter.spritePixelsPerUnit = spriteData.pixelsPerUnit;
                     changed = true;
                 }
+
+                if (settings.spritePixelsPerUnit != spriteData.pixelsPerUnit)
+                {
+                    settings.spritePixelsPerUnit = spriteData.pixelsPerUnit;
+                    settingsChanged = true;
+                }
             }
 
             if (spriteData.applyPivot)
@@ -809,6 +808,11 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                     textureImporter.mipmapEnabled = spriteData.generateMipMaps;
                     changed = true;
                 }
+                if (settings.mipmapEnabled != spriteData.generateMipMaps)
+                {
+                    settings.mipmapEnabled = spriteData.generateMipMaps;
+                    settingsChanged = true;
+                }
             }
 
             if (spriteData.applyCrunchCompression)
@@ -831,6 +835,11 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
 
             if (spriteData.applyAlphaIsTransparency)
             {
+                if (textureImporter.alphaIsTransparency != spriteData.alphaIsTransparency)
+                {
+                    textureImporter.alphaIsTransparency = spriteData.alphaIsTransparency;
+                    changed = true;
+                }
                 if (settings.alphaIsTransparency != spriteData.alphaIsTransparency)
                 {
                     settings.alphaIsTransparency = spriteData.alphaIsTransparency;
@@ -840,18 +849,15 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
 
             if (spriteData.applyReadWriteEnabled)
             {
-                if (settings.readable != spriteData.readWriteEnabled)
+                if (textureImporter.isReadable != spriteData.readWriteEnabled)
                 {
-                    settings.readable = spriteData.readWriteEnabled;
-                    settingsChanged = true;
+                    textureImporter.isReadable = spriteData.readWriteEnabled;
+                    changed = true;
                 }
-            }
 
-            if (spriteData.applySpriteMode)
-            {
-                if (settings.spriteMode != (int)spriteData.spriteMode)
+                if (settings.readable != spriteData.readWriteEnabled)
                 {
-                    settings.spriteMode = (int)spriteData.spriteMode;
+                    settings.readable = spriteData.readWriteEnabled;
                     settingsChanged = true;
                 }
             }
@@ -867,6 +873,11 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
 
             if (spriteData.applyWrapMode)
             {
+                if (textureImporter.wrapMode != spriteData.wrapMode)
+                {
+                    textureImporter.wrapMode = spriteData.wrapMode;
+                    changed = true;
+                }
                 if (settings.wrapMode != spriteData.wrapMode)
                 {
                     settings.wrapMode = spriteData.wrapMode;
@@ -876,6 +887,11 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
 
             if (spriteData.applyFilterMode)
             {
+                if (textureImporter.filterMode != spriteData.filterMode)
+                {
+                    textureImporter.filterMode = spriteData.filterMode;
+                    changed = true;
+                }
                 if (settings.filterMode != spriteData.filterMode)
                 {
                     settings.filterMode = spriteData.filterMode;
@@ -883,9 +899,10 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 }
             }
 
-            if (settingsChanged)
+            if (changed || settingsChanged)
             {
                 textureImporter.SetTextureSettings(settings);
+                textureImporter.SaveAndReimport();
             }
 
             return changed || settingsChanged;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc75.5",
+  "version": "2.0.0-rc75.7",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -68,6 +68,8 @@
 
 
 
+
+