GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.5

Browse Source 
# Conflicts:
#	Source/Engine/Serialization/Stream.cpp
This commit is contained in:
Wojtek Figat
2022-11-21 15:51:57 +01:00
parent 1dfea17bce b139ebfe88
commit 93c0dd704e
62 changed files with 391 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Engine/Serialization/Stream.cpp
View File

@@ -15,7 +15,6 @@
#include "Engine/Scripting/ManagedSerialization.h"
#include "Engine/Scripting/Scripting.h"
#include "Engine/Scripting/ScriptingObject.h"
#include "Engine/Scripting/ScriptingObjectReference.h"
#include "Engine/Scripting/ManagedCLR/MCore.h"
#include "Engine/Scripting/ManagedCLR/MUtils.h"
@@ -438,7 +437,7 @@ void ReadStream::Read(Variant& data)
ReadBytes(&data.AsData, sizeof(Quaternion));
break;
case VariantType::Transform:
ReadTransform((Transform*)&data.AsData);
ReadTransform(&data.AsTransform());
break;
case VariantType::Rectangle:
ReadBytes(&data.AsData, sizeof(Rectangle));