Merge pull request #4 from ruccho/fix/assets_not_saved_properly_2022.3

Fix assets don't saved propery after generation / clearing in 2022.3
ruccho · Feb 17, 2024 · 1d322cb · 1d322cb
2 parents 62dd72b + 400df01
commit 1d322cb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Packages/com.ruccho.fang-auto-tile/Editor/FangAutoTileEditor.cs b/Packages/com.ruccho.fang-auto-tile/Editor/FangAutoTileEditor.cs
@@ -335,11 +335,10 @@ private void Generate()
             }
             finally
             {
+                serializedObject.ApplyModifiedProperties();
                 AssetDatabase.SaveAssets();
                 AssetDatabase.Refresh();
                 AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(target));
-
-                serializedObject.ApplyModifiedProperties();
             }
         }
 
@@ -365,11 +364,10 @@ private void Clear()
             }
             */
 
+            serializedObject.ApplyModifiedProperties();
             AssetDatabase.SaveAssets();
             AssetDatabase.Refresh();
-
             AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(target));
-            serializedObject.ApplyModifiedProperties();
         }
 
         public void GenerateCombination()

diff --git a/Packages/com.ruccho.fang-auto-tile/Editor/FangAutoTilePackerEditor.cs b/Packages/com.ruccho.fang-auto-tile/Editor/FangAutoTilePackerEditor.cs
@@ -23,6 +23,8 @@ public override void OnInspectorGUI()
         public override Texture2D RenderStaticPreview(string assetPath, Object[] subAssets, int width, int height)
         {
             var compiledChannelsProp = serializedObject.FindProperty("compiledChannels");
+            if (compiledChannelsProp.arraySize == 0) return base.RenderStaticPreview(assetPath, subAssets, width, height);
+
             var channelProp = compiledChannelsProp.GetArrayElementAtIndex(0);
 
             if (channelProp != null)
@@ -183,18 +185,18 @@ private void Generate()
                 FangAutoTileEditor.GenerateTilesForTexture(dest, segmentsOrdered, false);
             }
 
+            serializedObject.ApplyModifiedProperties();
+
             AssetDatabase.SaveAssets();
             AssetDatabase.Refresh();
 
             foreach (var e in editors)
             {
-                AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(e.target));
                 e.serializedObject.ApplyModifiedProperties();
+                AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(e.target));
             }
 
             AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(target));
-
-            serializedObject.ApplyModifiedProperties();
         }
     }
 }
diff --git a/Packages/com.ruccho.fang-auto-tile/Runtime/FangAutoTile.cs b/Packages/com.ruccho.fang-auto-tile/Runtime/FangAutoTile.cs
@@ -81,9 +81,9 @@ public enum FrameModeType
         public IEnumerable<Sprite> GetAllSprites()
         {
             var spritesFromCombinations = combinations?.SelectMany(c => c.Frames) ?? Enumerable.Empty<Sprite>();
-            var spritesFromSlopes = slopeDefinition.Sizes?.SelectMany(s => s.GetAngles())
+            var spritesFromSlopes = slopeDefinition?.Sizes?.SelectMany(s => s.GetAngles())
                 .SelectMany(a => a.GetTileDefinitions()).SelectMany(tileDefs => tileDefs)
-                .SelectMany(tileDef => tileDef.Frames);
+                .SelectMany(tileDef => tileDef.Frames) ?? Enumerable.Empty<Sprite>();
 
             return spritesFromCombinations.Concat(spritesFromSlopes);
         }

diff --git a/Packages/com.ruccho.fang-auto-tile/package.json b/Packages/com.ruccho.fang-auto-tile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.ruccho.fang-auto-tile",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "displayName": "Fang Auto Tile",
   "description": "Fang Auto Tile is an extremely easy auto-tiling system.",
   "unity": "2021.3",