Merge branch 'master' into 1.5

This commit is contained in:
Wojtek Figat
2022-11-27 12:11:50 +01:00
49 changed files with 262 additions and 130 deletions

View File

@@ -11,7 +11,8 @@
/// <summary>
/// The scene animation playback actor.
/// </summary>
API_CLASS(Attributes = "ActorContextMenu(\"New/Other/Scene Animation\")") class FLAXENGINE_API SceneAnimationPlayer : public Actor, public IPostFxSettingsProvider
API_CLASS(Attributes="ActorContextMenu(\"New/Other/Scene Animation\"), ActorToolbox(\"Other\", \"Scene Animation\")")
class FLAXENGINE_API SceneAnimationPlayer : public Actor, public IPostFxSettingsProvider
{
DECLARE_SCENE_OBJECT(SceneAnimationPlayer);