Skip to content

Commit 6d71ebf

Browse files
NarazakaRamType0
andauthored
[RunsOnAllPlatforms] (#38)
* [RunsOnAllPlatforms] context.AssetContainer null check for NDMF VRM Exporter * ENABLE_NDMF_PLATFORM * #if ENABLE_NDMF_PLATFORM * style --------- Co-authored-by: Ram.Type-0 <39725073+RamType0@users.noreply.github.com>
1 parent ef3d428 commit 6d71ebf

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

‎Ndmf/Editor/Meshia.MeshSimplification.Ndmf.Editor.asmdef‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,16 @@
2727
"expression": "",
2828
"define": "ENABLE_NDMF"
2929
},
30+
{
31+
"name": "nadena.dev.ndmf",
32+
"expression": "1.8.0",
33+
"define": "ENABLE_NDMF_PLATFORM"
34+
},
3035
{
3136
"name": "nadena.dev.modular-avatar",
3237
"expression": "",
3338
"define": "ENABLE_MODULAR_AVATAR"
3439
}
3540
],
3641
"noEngineReferences": false
37-
}
42+
}

‎Ndmf/Editor/NdmfPlugin.cs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
namespace Meshia.MeshSimplification.Ndmf.Editor
1616
{
17+
#if ENABLE_NDMF_PLATFORM
18+
[RunsOnAllPlatforms]
19+
#endif
1720
class NdmfPlugin : Plugin<NdmfPlugin>
1821
{
1922
public override string DisplayName => "Meshia NDMF Mesh Simplifier";
@@ -83,7 +86,10 @@ protected override void Configure()
8386
if(meshiaMeshSimplifier.enabled && meshiaMeshSimplifier.TryGetComponent<Renderer>(out var renderer))
8487
{
8588
var (mesh, target, options, _, simplifiedMesh) = parameters[i++];
86-
AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);
89+
if (context.AssetContainer != null)
90+
{
91+
AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);
92+
}
8793
RendererUtility.SetMesh(renderer, simplifiedMesh);
8894
}
8995
}
@@ -101,7 +107,10 @@ protected override void Configure()
101107
if (!cascadingTarget.IsValid(meshiaCascadingMeshSimplifier) || !cascadingTarget.Enabled) continue;
102108
var renderer = cascadingTarget.GetTargetRenderer(meshiaCascadingMeshSimplifier)!;
103109
var (mesh, target, options, _, simplifiedMesh) = parameters[i++];
104-
AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);
110+
if (context.AssetContainer != null)
111+
{
112+
AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);
113+
}
105114
RendererUtility.SetMesh(renderer, simplifiedMesh);
106115

107116
}

0 commit comments

Comments
 (0)