Merge remote-tracking branch 'origin/master' into 1.1
# Conflicts: # Source/Engine/Navigation/NavMesh.cpp # Source/Engine/Navigation/NavMeshBuilder.cpp
This commit is contained in:
@@ -80,7 +80,7 @@ namespace FlaxEditor.Progress
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Called when progress action gets updated (changed nfo text or progress value).
|
||||
/// Called when progress action gets updated (changed info text or progress value).
|
||||
/// </summary>
|
||||
/// <param name="progress">The progress (normalized to range [0;1]).</param>
|
||||
/// <param name="infoText">The information text.</param>
|
||||
|
||||
Reference in New Issue
Block a user