GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7

Browse Source
This commit is contained in:
Wojciech Figat
2023-01-24 09:30:38 +01:00
parent c9c35eb74e 3ca0ea2e50
commit 798b950046
6 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Content/Import/ModelImportEntry.cs
View File

@@ -566,6 +566,8 @@ namespace FlaxEditor.Content.Import
}
internal static void Free(InternalOptionsNative unmanaged)
{
ManagedString.Free(unmanaged.CollisionMeshesPrefix);
ManagedString.Free(unmanaged.RootNodeName);
}
}

4
Source/Editor/Content/Import/TextureImportEntry.cs
View File

@@ -368,8 +368,8 @@ namespace FlaxEditor.Content.Import
MaxSize = managed.MaxSize,
TextureGroup = managed.TextureGroup,
Size = managed.Size,
SpriteAreas = managed.SpriteAreas != IntPtr.Zero ? NativeInterop.GCHandleArrayToManagedArray<Rectangle>((ManagedArray)GCHandle.FromIntPtr(managed.SpriteAreas).Target) : null,
SpriteNames = managed.SpriteNames != IntPtr.Zero ? NativeInterop.GCHandleArrayToManagedArray<string>((ManagedArray)GCHandle.FromIntPtr(managed.SpriteNames).Target) : null,
SpriteAreas = managed.SpriteAreas != IntPtr.Zero ? ((ManagedArray)ManagedHandle.FromIntPtr(managed.SpriteAreas).Target).GetArray<Rectangle>() : null,
SpriteNames = managed.SpriteNames != IntPtr.Zero ? NativeInterop.GCHandleArrayToManagedArray<string>((ManagedArray)ManagedHandle.FromIntPtr(managed.SpriteNames).Target) : null,
};
}
internal static InternalOptionsNative ToNative(InternalOptions managed)