Merge branch 'master' into 1.5

# Conflicts: # Source/Engine/Serialization/Stream.cpp
2022-11-21 15:51:57 +01:00
parent 1dfea17bce b139ebfe88
commit 93c0dd704e
62 changed files with 391 additions and 351 deletions
--- a/Source/Engine/Core/Types/Variant.cpp
+++ b/Source/Engine/Core/Types/Variant.cpp
@@ -2268,6 +2268,11 @@ const Ray& Variant::AsRay() const
 #endif
 }

+Transform& Variant::AsTransform()
+{
+    return *(Transform*)AsBlob.Data;
+}
+
 const Transform& Variant::AsTransform() const
 {
    return *(const Transform*)AsBlob.Data;
--- a/Source/Engine/Core/Types/Variant.h
+++ b/Source/Engine/Core/Types/Variant.h
@@ -332,6 +332,7 @@ public:
    const BoundingBox& AsBoundingBox() const;
    Ray& AsRay();
    const Ray& AsRay() const;
+    Transform& AsTransform();
    const Transform& AsTransform() const;
    const Matrix& AsMatrix() const;
    Array<Variant, HeapAllocation>& AsArray();