Merge remote-tracking branch 'origin/master' into 1.6

2023-06-11 21:38:20 +02:00
parent 652f8ccb8d 5f8e5d44dc
commit 7140c4a2d8
20 changed files with 212 additions and 93 deletions
--- a/Source/Engine/Scripting/ScriptingObject.h
+++ b/Source/Engine/Scripting/ScriptingObject.h
@@ -156,7 +156,7 @@ public:
    template<typename T>
    static T* Cast(ScriptingObject* obj)
    {
-        return obj && CanCast(obj->GetClass(), T::GetStaticClass()) ? (T*)obj : nullptr;
+        return obj && CanCast(obj->GetClass(), T::GetStaticClass()) ? static_cast<T*>(obj) : nullptr;
    }

    bool Is(const ScriptingTypeHandle& type) const;