Skip to content

Commit 04d6c6b

Browse files
sr4devsr4dev
authored
Merge pull request #74 from sr4dev/fix/null_path_issue_in_assetpostprocessor
Fix/null path issue in assetpostprocessor
2 parents 12817e6 + da65f3f commit 04d6c6b

11 files changed

Lines changed: 44 additions & 169 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/[Bb]uilds/
1010
/[Ll]ogs/
1111
/[Mm]emoryCaptures/
12+
/[Uu]serSettings/
1213

1314
# Asset meta data should only be ignored when the corresponding asset is also ignored
1415
!/[Aa]ssets/**/*.meta

‎Assets/Example/Atlas.spriteatlas‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎Assets/Example/Atlas.spriteatlas.meta‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Assets/SpriteAssist/Editor/Import/SpritePostProcessor.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ public class SpritePostProcessor : AssetPostprocessor
77
{
88
private void OnPostprocessSprites(Texture2D tex, Sprite[] sprites)
99
{
10-
string path = AssetDatabase.GetAssetPath(tex);
11-
if(!SpriteAssistSettings.instance.ShouldProcessSprite(path)) return;
10+
if (!SpriteAssistSettings.instance.ShouldProcessSprite(assetPath)) return;
1211

1312
SpriteInspector.isSpriteReloaded = true;
1413

‎Assets/SpriteAssist/Example~/Atlas.spriteatlas‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎Assets/SpriteAssist/Example~/Atlas.spriteatlas.meta‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Packages/manifest.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.collab-proxy": "1.17.7",
5-
"com.unity.ide.rider": "3.0.16",
6-
"com.unity.ide.visualstudio": "2.0.16",
4+
"com.unity.ai.navigation": "1.1.5",
5+
"com.unity.collab-proxy": "2.6.0",
6+
"com.unity.ide.rider": "3.0.34",
7+
"com.unity.ide.visualstudio": "2.0.22",
78
"com.unity.ide.vscode": "1.2.5",
8-
"com.unity.test-framework": "1.1.31",
9-
"com.unity.textmeshpro": "3.0.6",
10-
"com.unity.timeline": "1.6.4",
9+
"com.unity.test-framework": "1.1.33",
10+
"com.unity.textmeshpro": "3.0.7",
11+
"com.unity.timeline": "1.7.6",
1112
"com.unity.ugui": "1.0.0",
1213
"com.unity.modules.ai": "1.0.0",
1314
"com.unity.modules.androidjni": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,22 @@
66
"source": "builtin",
77
"dependencies": {}
88
},
9-
"com.unity.collab-proxy": {
10-
"version": "1.17.7",
9+
"com.unity.ai.navigation": {
10+
"version": "1.1.5",
1111
"depth": 0,
1212
"source": "registry",
1313
"dependencies": {
14-
"com.unity.services.core": "1.0.1"
14+
"com.unity.modules.ai": "1.0.0"
1515
},
1616
"url": "https://packages.unity.com"
1717
},
18+
"com.unity.collab-proxy": {
19+
"version": "2.6.0",
20+
"depth": 0,
21+
"source": "registry",
22+
"dependencies": {},
23+
"url": "https://packages.unity.com"
24+
},
1825
"com.unity.ext.nunit": {
1926
"version": "1.0.6",
2027
"depth": 1,
@@ -23,7 +30,7 @@
2330
"url": "https://packages.unity.com"
2431
},
2532
"com.unity.ide.rider": {
26-
"version": "3.0.16",
33+
"version": "3.0.34",
2734
"depth": 0,
2835
"source": "registry",
2936
"dependencies": {
@@ -32,7 +39,7 @@
3239
"url": "https://packages.unity.com"
3340
},
3441
"com.unity.ide.visualstudio": {
35-
"version": "2.0.16",
42+
"version": "2.0.22",
3643
"depth": 0,
3744
"source": "registry",
3845
"dependencies": {
@@ -47,26 +54,8 @@
4754
"dependencies": {},
4855
"url": "https://packages.unity.com"
4956
},
50-
"com.unity.nuget.newtonsoft-json": {
51-
"version": "3.0.2",
52-
"depth": 2,
53-
"source": "registry",
54-
"dependencies": {},
55-
"url": "https://packages.unity.com"
56-
},
57-
"com.unity.services.core": {
58-
"version": "1.6.0",
59-
"depth": 1,
60-
"source": "registry",
61-
"dependencies": {
62-
"com.unity.modules.unitywebrequest": "1.0.0",
63-
"com.unity.nuget.newtonsoft-json": "3.0.2",
64-
"com.unity.modules.androidjni": "1.0.0"
65-
},
66-
"url": "https://packages.unity.com"
67-
},
6857
"com.unity.test-framework": {
69-
"version": "1.1.31",
58+
"version": "1.1.33",
7059
"depth": 0,
7160
"source": "registry",
7261
"dependencies": {
@@ -77,7 +66,7 @@
7766
"url": "https://packages.unity.com"
7867
},
7968
"com.unity.textmeshpro": {
80-
"version": "3.0.6",
69+
"version": "3.0.7",
8170
"depth": 0,
8271
"source": "registry",
8372
"dependencies": {
@@ -86,13 +75,13 @@
8675
"url": "https://packages.unity.com"
8776
},
8877
"com.unity.timeline": {
89-
"version": "1.6.4",
78+
"version": "1.7.6",
9079
"depth": 0,
9180
"source": "registry",
9281
"dependencies": {
82+
"com.unity.modules.audio": "1.0.0",
9383
"com.unity.modules.director": "1.0.0",
9484
"com.unity.modules.animation": "1.0.0",
95-
"com.unity.modules.audio": "1.0.0",
9685
"com.unity.modules.particlesystem": "1.0.0"
9786
},
9887
"url": "https://packages.unity.com"
@@ -238,17 +227,6 @@
238227
"version": "1.0.0",
239228
"depth": 0,
240229
"source": "builtin",
241-
"dependencies": {
242-
"com.unity.modules.ui": "1.0.0",
243-
"com.unity.modules.imgui": "1.0.0",
244-
"com.unity.modules.jsonserialize": "1.0.0",
245-
"com.unity.modules.uielementsnative": "1.0.0"
246-
}
247-
},
248-
"com.unity.modules.uielementsnative": {
249-
"version": "1.0.0",
250-
"depth": 1,
251-
"source": "builtin",
252230
"dependencies": {
253231
"com.unity.modules.ui": "1.0.0",
254232
"com.unity.modules.imgui": "1.0.0",

‎ProjectSettings/EditorSettings.asset‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,45 @@
33
--- !u!159 &1
44
EditorSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 9
7-
m_ExternalVersionControlSupport: Visible Meta Files
6+
serializedVersion: 12
87
m_SerializationMode: 2
98
m_LineEndingsForNewScripts: 0
109
m_DefaultBehaviorMode: 0
1110
m_PrefabRegularEnvironment: {fileID: 0}
1211
m_PrefabUIEnvironment: {fileID: 0}
1312
m_SpritePackerMode: 4
13+
m_SpritePackerCacheSize: 10
1414
m_SpritePackerPaddingPower: 1
15+
m_Bc7TextureCompressor: 0
1516
m_EtcTextureCompressorBehavior: 1
1617
m_EtcTextureFastCompressor: 1
1718
m_EtcTextureNormalCompressor: 2
1819
m_EtcTextureBestCompressor: 4
1920
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref
2021
m_ProjectGenerationRootNamespace:
21-
m_CollabEditorSettings:
22-
inProgressEnabled: 1
2322
m_EnableTextureStreamingInEditMode: 1
2423
m_EnableTextureStreamingInPlayMode: 1
24+
m_EnableEditorAsyncCPUTextureLoading: 0
2525
m_AsyncShaderCompilation: 1
26+
m_PrefabModeAllowAutoSave: 1
2627
m_EnterPlayModeOptionsEnabled: 0
2728
m_EnterPlayModeOptions: 3
28-
m_ShowLightmapResolutionOverlay: 1
29+
m_GameObjectNamingDigits: 1
30+
m_GameObjectNamingScheme: 0
31+
m_AssetNamingUsesSpace: 1
32+
m_InspectorUseIMGUIDefaultInspector: 0
2933
m_UseLegacyProbeSampleCount: 0
34+
m_SerializeInlineMappingsOnOneLine: 0
35+
m_DisableCookiesInLightmapper: 1
3036
m_AssetPipelineMode: 1
37+
m_RefreshImportMode: 0
3138
m_CacheServerMode: 0
3239
m_CacheServerEndpoint:
3340
m_CacheServerNamespacePrefix: default
3441
m_CacheServerEnableDownload: 1
3542
m_CacheServerEnableUpload: 1
43+
m_CacheServerEnableAuth: 0
44+
m_CacheServerEnableTls: 0
45+
m_CacheServerValidationMode: 2
46+
m_CacheServerDownloadBatchSize: 128
47+
m_EnableEnlightenBakedGI: 0

‎ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.15f1
2-
m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834)
1+
m_EditorVersion: 2022.3.55f1
2+
m_EditorVersionWithRevision: 2022.3.55f1 (9f374180d209)

0 commit comments

Comments
 (0)