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

Fix regression in curve keyframes editing

Browse Source 
#3179
This commit is contained in:
Wojtek Figat
2025-01-27 20:19:35 +01:00
parent aabd70fbe7
commit e2fd3891d1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Level/Actors/Spline.cpp
View File

@@ -476,9 +476,9 @@ void Spline::GetKeyframes(MArray* data)
Platform::MemoryCopy(MCore::Array::GetAddress(data), Curve.GetKeyframes().Get(), sizeof(Keyframe) * Curve.GetKeyframes().Count()); Platform::MemoryCopy(MCore::Array::GetAddress(data), Curve.GetKeyframes().Get(), sizeof(Keyframe) * Curve.GetKeyframes().Count());
} }
void Spline::SetKeyframes(MArray* data) void Spline::SetKeyframes(MArray* data, int32 keySize)
{ {
Curve = Span<byte>((const byte*)MCore::Array::GetAddress(data), MCore::Array::GetLength(data)); Curve = Span<byte>(MCore::Array::GetAddress<byte>(data), keySize * MCore::Array::GetLength(data));
UpdateSpline(); UpdateSpline();
} }

2
Source/Engine/Level/Actors/Spline.h
View File

@@ -372,7 +372,7 @@ private:
// Internal bindings // Internal bindings
#if !COMPILE_WITHOUT_CSHARP #if !COMPILE_WITHOUT_CSHARP
API_FUNCTION(NoProxy) void GetKeyframes(MArray* data); API_FUNCTION(NoProxy) void GetKeyframes(MArray* data);
API_FUNCTION(NoProxy) void SetKeyframes(MArray* data); API_FUNCTION(NoProxy) void SetKeyframes(MArray* data, int32 keySize);
#endif #endif
public: public:

2
Source/Engine/Level/Spline.cs
View File

@@ -34,7 +34,7 @@ namespace FlaxEngine
if (value == null) if (value == null)
value = Utils.GetEmptyArray<BezierCurve<Transform>.Keyframe>(); value = Utils.GetEmptyArray<BezierCurve<Transform>.Keyframe>();
_keyframes = null; _keyframes = null;
Internal_SetKeyframes(__unmanagedPtr, value); Internal_SetKeyframes(__unmanagedPtr, value, System.Runtime.CompilerServices.Unsafe.SizeOf<BezierCurve<Transform>.Keyframe>());
} }
} }