Merge branch 'master' into marshalling_scriptingobject_changes

# Conflicts: # Source/Engine/Engine/NativeInterop.Invoker.cs # Source/Engine/Engine/NativeInterop.Unmanaged.cs
2023-08-20 20:24:41 +03:00
parent 53b1d0dd85 9afb8778e8
commit 42ab218a8e
35 changed files with 859 additions and 424 deletions
--- a/Source/Engine/Scripting/Runtime/DotNet.cpp
+++ b/Source/Engine/Scripting/Runtime/DotNet.cpp
@@ -907,7 +907,7 @@ MMethod* MClass::GetMethod(const char* name, int32 numParams) const
    GetMethods();
    for (int32 i = 0; i < _methods.Count(); i++)
    {
-        if (_methods[i]->GetName() == name && _methods[i]->GetParametersCount() == numParams)
+        if (_methods[i]->GetParametersCount() == numParams && _methods[i]->GetName() == name)
            return _methods[i];
    }
    return nullptr;