From 2e82f24fd79601ff22b8e93bb592017d125ec186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Tue, 26 Dec 2023 02:01:14 +0100 Subject: [PATCH] Initialize ScriptGlue whenever ScriptEngine loads assemblies --- GlitchyEngine/src/Scripting/ScriptEngine.bf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/GlitchyEngine/src/Scripting/ScriptEngine.bf b/GlitchyEngine/src/Scripting/ScriptEngine.bf index 823be96..bda8373 100644 --- a/GlitchyEngine/src/Scripting/ScriptEngine.bf +++ b/GlitchyEngine/src/Scripting/ScriptEngine.bf @@ -214,7 +214,6 @@ static class ScriptEngine public static void Init() { InitMono(); - ScriptGlue.Init(); LoadScriptAssemblies(); } @@ -304,6 +303,8 @@ static class ScriptEngine { Debug.Profiler.ProfileFunction!(); + ScriptGlue.Init(); + CreateAppDomain("GlitchyEngineScriptRuntime"); (s_CoreAssembly, s_CoreAssemblyImage) = LoadAssembly("resources/scripts/ScriptCore.dll", _debuggingEnabled); @@ -844,7 +845,7 @@ static class ScriptEngine #unwarn void*[2] args = .(&entityId, monoReflectionType); - + let method = Classes.EntityEditor.GetMethod("ShowDefaultEntityEditor", 2); Classes.EntityEditor.Invoke(method, null, &args);