Include EditorModules in Assembly lookup paths

2023-09-16 14:14:26 +03:00
parent 722133165b
commit 2d2bfd9cd1
3 changed files with 13 additions and 6 deletions
--- a/Source/Engine/Scripting/Runtime/DotNet.cpp
+++ b/Source/Engine/Scripting/Runtime/DotNet.cpp
@@ -719,6 +719,13 @@ bool MAssembly::LoadImage(const String& assemblyPath, const StringView& nativePa
        StringAnsi nativeName = _name.EndsWith(".CSharp") ? StringAnsi(_name.Get(), _name.Length() - 7) : StringAnsi(_name);
        RegisterNativeLibrary(nativeName.Get(), StringAnsi(nativePath).Get());
    }
+#if USE_EDITOR
+    // Register the editor module location for Assembly resolver
+    else
+    {
+        RegisterNativeLibrary(_name.Get(), StringAnsi(assemblyPath).Get());
+    }
+#endif

    _hasCachedClasses = false;
    _assemblyPath = assemblyPath;