diff --git a/Source/Editor/GUI/Timeline/Media.cs b/Source/Editor/GUI/Timeline/Media.cs index 0f0025f76..70783b449 100644 --- a/Source/Editor/GUI/Timeline/Media.cs +++ b/Source/Editor/GUI/Timeline/Media.cs @@ -525,11 +525,11 @@ namespace FlaxEditor.GUI.Timeline private void EndMoving() { _isMoving = false; - _startMoveLeftEdge = false; - _startMoveRightEdge = false; - if (_startMoveLeftEdge || _startMoveRightEdge) { + _startMoveLeftEdge = false; + _startMoveRightEdge = false; + // Re-assign the media start/duration inside the undo recording block if (_startMoveStartFrame != _startFrame || _startMoveDuration != _durationFrames) { diff --git a/Source/Editor/Managed/ManagedEditor.cpp b/Source/Editor/Managed/ManagedEditor.cpp index 4ac4709a3..b37ebf132 100644 --- a/Source/Editor/Managed/ManagedEditor.cpp +++ b/Source/Editor/Managed/ManagedEditor.cpp @@ -476,11 +476,6 @@ void ManagedEditor::OnEditorAssemblyLoaded(MAssembly* assembly) CreateManaged(); } -String ManagedEditor::ToString() const -{ - return TEXT("ManagedEditor"); -} - void ManagedEditor::DestroyManaged() { // Ensure to cleanup managed stuff diff --git a/Source/Editor/Managed/ManagedEditor.h b/Source/Editor/Managed/ManagedEditor.h index df05e87bd..734dadc3c 100644 --- a/Source/Editor/Managed/ManagedEditor.h +++ b/Source/Editor/Managed/ManagedEditor.h @@ -145,6 +145,5 @@ private: public: // [PersistentScriptingObject] - String ToString() const override; void DestroyManaged() override; }; diff --git a/Source/Editor/Viewport/Previews/AnimationPreview.cs b/Source/Editor/Viewport/Previews/AnimationPreview.cs index 9ef6fedb9..92130b438 100644 --- a/Source/Editor/Viewport/Previews/AnimationPreview.cs +++ b/Source/Editor/Viewport/Previews/AnimationPreview.cs @@ -44,7 +44,7 @@ namespace FlaxEditor.Viewport.Previews // Playback Speed { var playbackSpeed = ViewWidgetButtonMenu.AddButton("Playback Speed"); - var playbackSpeedValue = new FloatValueBox(-1, 90, 2, 70.0f, 0.0f, 10000.0f, 0.001f) + var playbackSpeedValue = new FloatValueBox(-1, 90, 2, 70.0f, -10000.0f, 10000.0f, 0.001f) { Parent = playbackSpeed }; diff --git a/Source/Engine/Animations/Curve.h b/Source/Engine/Animations/Curve.h index 8564f6912..2d3a9b50b 100644 --- a/Source/Engine/Animations/Curve.h +++ b/Source/Engine/Animations/Curve.h @@ -769,6 +769,12 @@ public: } }; +/// +/// An animation spline represented by a set of keyframes, each representing a value point. +/// +template +using StepCurve = Curve>; + /// /// An animation spline represented by a set of keyframes, each representing an endpoint of a linear curve. /// diff --git a/Source/Engine/Animations/Graph/AnimGraph.h b/Source/Engine/Animations/Graph/AnimGraph.h index 88c7a2eec..f7dd36b10 100644 --- a/Source/Engine/Animations/Graph/AnimGraph.h +++ b/Source/Engine/Animations/Graph/AnimGraph.h @@ -384,7 +384,7 @@ public: /// /// The slots animations. /// - Array Slots; + Array> Slots; public: diff --git a/Source/Engine/Graphics/RenderBuffers.cpp b/Source/Engine/Graphics/RenderBuffers.cpp index 82e5a3821..71fe5961e 100644 --- a/Source/Engine/Graphics/RenderBuffers.cpp +++ b/Source/Engine/Graphics/RenderBuffers.cpp @@ -183,8 +183,3 @@ void RenderBuffers::Release() UPDATE_LAZY_KEEP_RT(LuminanceMap); #undef UPDATE_LAZY_KEEP_RT } - -String RenderBuffers::ToString() const -{ - return TEXT("RenderBuffers"); -} diff --git a/Source/Engine/Graphics/RenderBuffers.h b/Source/Engine/Graphics/RenderBuffers.h index fd4bce1b1..75f7f3d50 100644 --- a/Source/Engine/Graphics/RenderBuffers.h +++ b/Source/Engine/Graphics/RenderBuffers.h @@ -175,9 +175,4 @@ public: /// Release the buffers data. /// API_FUNCTION() void Release(); - -public: - - // [PersistentScriptingObject] - String ToString() const override; };