diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-18 00:42:50 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-18 00:42:50 +0200 |
| commit | ee39c68d4fb61a0c41134da0d6d5ffaa91c25104 (patch) | |
| tree | 22c3fabbcdd6ea325958069f73b68dd469f905c2 /modules/mono/editor | |
| parent | ba35d2bff4a0309dd987d1dab737199ce2a6a29b (diff) | |
| parent | 5090355907e7c3e7f4519e239b88aebe09e76883 (diff) | |
Merge pull request #65946 from antonWetzel/csharp-nd-array
Don't marshal multidimensional arrays
Diffstat (limited to 'modules/mono/editor')
| -rw-r--r-- | modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs index efdd50098e..f31ded4d77 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs @@ -156,6 +156,10 @@ namespace Godot.SourceGenerators else if (typeKind == TypeKind.Array) { var arrayType = (IArrayTypeSymbol)type; + + if (arrayType.Rank != 1) + return null; + var elementType = arrayType.ElementType; switch (elementType.SpecialType) @@ -177,8 +181,8 @@ namespace Godot.SourceGenerators if (elementType.SimpleDerivesFrom(typeCache.GodotObjectType)) return MarshalType.GodotObjectOrDerivedArray; - if (elementType.ContainingAssembly.Name == "GodotSharp" && - elementType.ContainingNamespace.Name == "Godot") + if (elementType.ContainingAssembly?.Name == "GodotSharp" && + elementType.ContainingNamespace?.Name == "Godot") { switch (elementType) { |