use GetFieldOffset instead of Marshal.OffsetOf to avoid bug on IL…

…2CPP. (#9)
quabug · Aug 14, 2021 · ea47a81 · ea47a81
1 parent 2bbb147
commit ea47a81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Packages/blob-editor/Runtime/Builder/Builders.cs b/Packages/blob-editor/Runtime/Builder/Builders.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using Unity.Collections.LowLevel.Unsafe;
 using Unity.Entities;
 using UnityEngine;
@@ -57,10 +56,7 @@ public override unsafe void Build(BlobBuilder builder, ref T data)
             var fields = typeof(T).GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
             for (var i = 0; i < Builders.Length; i++)
             {
-#if ENABLE_IL2CPP
-#warning `Marshal.OffsetOf` may not work as expected with IL2CPP backend: https://issuetracker.unity3d.com/issues/marshal-dot-offsetof-returns-incorrect-offset-when-building-the-project-with-il2cpp-scripting-backend
-#endif
-                var offset = Marshal.OffsetOf<T>(fields[i].Name).ToInt32();
+                var offset = UnsafeUtility.GetFieldOffset(fields[i]);
                 Builders[i].Build(builder, dataPtr + offset);
             }
         }

diff --git a/Packages/blob-editor/package.json b/Packages/blob-editor/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.quabug.blob-editor",
   "description": "Inspector-editor of blob asset",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "unity": "2020.3",
   "displayName": "BlobEditor",
   "dependencies": {