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

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source
This commit is contained in:
Wojtek Figat
2024-08-16 14:52:57 +02:00
parent b1127f2e05 d779862271
commit 21b4c7c916
47 changed files with 345 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Engine/Level/Actor.h
View File

@@ -996,37 +996,37 @@ public:
/// <summary>
/// Called when actor parent gets changed.
/// </summary>
virtual void OnParentChanged();
API_FUNCTION() virtual void OnParentChanged();
/// <summary>
/// Called when actor transform gets changed.
/// </summary>
virtual void OnTransformChanged();
API_FUNCTION() virtual void OnTransformChanged();
/// <summary>
/// Called when actor active state gets changed.
/// </summary>
virtual void OnActiveChanged();
API_FUNCTION() virtual void OnActiveChanged();
/// <summary>
/// Called when actor active in tree state gets changed.
/// </summary>
virtual void OnActiveInTreeChanged();
API_FUNCTION() virtual void OnActiveInTreeChanged();
/// <summary>
/// Called when order in parent children array gets changed.
/// </summary>
virtual void OnOrderInParentChanged();
API_FUNCTION() virtual void OnOrderInParentChanged();
/// <summary>
/// Called when actor static flag gets changed.
/// </summary>
virtual void OnStaticFlagsChanged();
API_FUNCTION() virtual void OnStaticFlagsChanged();
/// <summary>
/// Called when layer gets changed.
/// </summary>
virtual void OnLayerChanged();
API_FUNCTION() virtual void OnLayerChanged();
/// <summary>
/// Called when adding object to the game.

2
Source/Engine/Level/Actors/AnimatedModel.cpp
View File

@@ -506,7 +506,7 @@ void AnimatedModel::StopSlotAnimation(const StringView& slotName, Animation* ani
{
if (slot.Animation == anim && slot.Name == slotName)
{
slot.Animation = nullptr;
//slot.Animation = nullptr; // TODO: make an immediate version of this method and set the animation to nullptr.
slot.Reset = true;
break;
}