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

Variosu tweaks

Browse Source
This commit is contained in:
Wojtek Figat
2024-02-07 18:56:07 +01:00
parent d1f40d1c47
commit e75902e900
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Modules/WindowsModule.cs
View File

@@ -725,9 +725,7 @@ namespace FlaxEditor.Modules
for (int i = 0; i < Windows.Count; i++) for (int i = 0; i < Windows.Count; i++)
{ {
if (string.Equals(Windows[i].SerializationTypename, typename, StringComparison.OrdinalIgnoreCase)) if (string.Equals(Windows[i].SerializationTypename, typename, StringComparison.OrdinalIgnoreCase))
{
return Windows[i]; return Windows[i];
}
} }
// Check if it's an asset ID // Check if it's an asset ID

2
Source/Editor/Surface/Archetypes/Animation.StateMachine.cs
View File

@@ -191,9 +191,7 @@ namespace FlaxEditor.Surface.Archetypes
var value = title; var value = title;
int count = 1; int count = 1;
while (!OnRenameValidate(null, value)) while (!OnRenameValidate(null, value))
{
value = title + " " + count++; value = title + " " + count++;
}
Values[0] = value; Values[0] = value;
Title = value; Title = value;

2
Source/Editor/Windows/EditorWindow.cs
View File

@@ -226,6 +226,8 @@ namespace FlaxEditor.Windows
/// <inheritdoc /> /// <inheritdoc />
public override void OnDestroy() public override void OnDestroy()
{ {
if (IsDisposing)
return;
OnExit(); OnExit();
// Unregister // Unregister

2
Source/Engine/Animations/Graph/AnimGraph.h
View File

@@ -205,7 +205,7 @@ struct FLAXENGINE_API AnimGraphSlot
/// <summary> /// <summary>
/// The animation graph state container for a single node playback trace (eg. animation sample info or state transition). Can be used by Anim Graph debugging or custom scripting. /// The animation graph state container for a single node playback trace (eg. animation sample info or state transition). Can be used by Anim Graph debugging or custom scripting.
/// </summary> /// </summary>
API_STRUCT() struct FLAXENGINE_API AnimGraphTraceEvent API_STRUCT(NoDefault) struct FLAXENGINE_API AnimGraphTraceEvent
{ {
DECLARE_SCRIPTING_TYPE_MINIMAL(AnimGraphTraceEvent); DECLARE_SCRIPTING_TYPE_MINIMAL(AnimGraphTraceEvent);

2
Source/Engine/Animations/Graph/AnimGroup.Animation.cpp
View File

@@ -506,7 +506,7 @@ Variant AnimGraphExecutor::SampleState(AnimGraphNode* state)
void AnimGraphExecutor::InitStateTransition(AnimGraphContext& context, AnimGraphInstanceData::StateMachineBucket& stateMachineBucket, AnimGraphStateTransition* transition) void AnimGraphExecutor::InitStateTransition(AnimGraphContext& context, AnimGraphInstanceData::StateMachineBucket& stateMachineBucket, AnimGraphStateTransition* transition)
{ {
// Reset transiton // Reset transition
stateMachineBucket.ActiveTransition = transition; stateMachineBucket.ActiveTransition = transition;
stateMachineBucket.TransitionPosition = 0.0f; stateMachineBucket.TransitionPosition = 0.0f;