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

Merge remote-tracking branch 'origin/master' into linux-editor

Browse Source 
# Conflicts:
#	Source/Engine/Core/Math/Color.cs
#	Source/Engine/Navigation/Navigation.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
This commit is contained in:
Wojtek Figat
2021-02-23 22:29:07 +01:00
parent 747a9bcb98 87a290b45c
commit cf3ac7a26e
147 changed files with 1740 additions and 1311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Engine/Navigation/NavMeshRuntime.cpp
View File

@@ -51,7 +51,7 @@ bool NavMeshRuntime::FindDistanceToWall(const Vector3& startPosition, NavMeshHit
ScopeLock lock(Locker);
const auto query = GetNavMeshQuery();
if (!query)
if (!query || !_navMesh)
{
return false;
}
@@ -89,7 +89,7 @@ bool NavMeshRuntime::FindPath(const Vector3& startPosition, const Vector3& endPo
ScopeLock lock(Locker);
const auto query = GetNavMeshQuery();
if (!query)
if (!query || !_navMesh)
{
return false;
}
@@ -158,7 +158,7 @@ bool NavMeshRuntime::TestPath(const Vector3& startPosition, const Vector3& endPo
ScopeLock lock(Locker);
const auto query = GetNavMeshQuery();
if (!query)
if (!query || !_navMesh)
{
return false;
}
@@ -205,7 +205,7 @@ bool NavMeshRuntime::ProjectPoint(const Vector3& point, Vector3& result) const
ScopeLock lock(Locker);
const auto query = GetNavMeshQuery();
if (!query)
if (!query || !_navMesh)
{
return false;
}
@@ -236,7 +236,7 @@ bool NavMeshRuntime::RayCast(const Vector3& startPosition, const Vector3& endPos
ScopeLock lock(Locker);
const auto query = GetNavMeshQuery();
if (!query)
if (!query || !_navMesh)
{
return false;
}