From 5a23df6478d266886085f2837c7e17a2eaaf3526 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 12 Feb 2021 10:34:50 +0100 Subject: [PATCH] Fix missing saving Pre Rotation --- Source/Engine/Level/Actors/SplineModel.cpp | 2 ++ Source/Engine/Physics/Colliders/SplineCollider.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Level/Actors/SplineModel.cpp b/Source/Engine/Level/Actors/SplineModel.cpp index c06dfe75e..2a0972ffa 100644 --- a/Source/Engine/Level/Actors/SplineModel.cpp +++ b/Source/Engine/Level/Actors/SplineModel.cpp @@ -447,6 +447,7 @@ void SplineModel::Serialize(SerializeStream& stream, const void* otherObj) SERIALIZE_MEMBER(BoundsScale, _boundsScale); SERIALIZE_MEMBER(LODBias, _lodBias); SERIALIZE_MEMBER(ForcedLOD, _forcedLod); + SERIALIZE_MEMBER(PreRotation, _preRotation) SERIALIZE(Model); SERIALIZE(DrawModes); @@ -463,6 +464,7 @@ void SplineModel::Deserialize(DeserializeStream& stream, ISerializeModifier* mod DESERIALIZE_MEMBER(BoundsScale, _boundsScale); DESERIALIZE_MEMBER(LODBias, _lodBias); DESERIALIZE_MEMBER(ForcedLOD, _forcedLod); + DESERIALIZE_MEMBER(PreRotation, _preRotation); DESERIALIZE(Model); DESERIALIZE(DrawModes); diff --git a/Source/Engine/Physics/Colliders/SplineCollider.cpp b/Source/Engine/Physics/Colliders/SplineCollider.cpp index ff670fcd5..6855eae69 100644 --- a/Source/Engine/Physics/Colliders/SplineCollider.cpp +++ b/Source/Engine/Physics/Colliders/SplineCollider.cpp @@ -120,6 +120,7 @@ void SplineCollider::Serialize(SerializeStream& stream, const void* otherObj) SERIALIZE_GET_OTHER_OBJ(SplineCollider); SERIALIZE(CollisionData); + SERIALIZE_MEMBER(PreRotation, _preRotation) } void SplineCollider::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) @@ -128,6 +129,7 @@ void SplineCollider::Deserialize(DeserializeStream& stream, ISerializeModifier* Collider::Deserialize(stream, modifier); DESERIALIZE(CollisionData); + DESERIALIZE_MEMBER(PreRotation, _preRotation); } void SplineCollider::OnParentChanged() @@ -325,7 +327,7 @@ void SplineCollider::GetGeometry(PxGeometryHolder& geometry) #if !USE_EDITOR // Free memory for static splines (if editor collision preview is not needed) - if (IsStatic()) + if (IsTransformStatic()) { _vertexBuffer.Resize(0); _indexBuffer.Resize(0);