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.6

Browse Source 
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
This commit is contained in:
Wojtek Figat
2023-04-22 18:59:41 +02:00
parent 644eb35b97 73ff053470
commit 390460907d
51 changed files with 1397 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Engine/Physics/CollisionCooking.cpp
View File

@@ -118,12 +118,7 @@ bool CollisionCooking::CookCollision(const Argument& arg, CollisionData::Seriali
indexCounts.Resize(needIndexBuffer ? meshesCount : 0);
vertexCounts.SetAll(0);
indexCounts.SetAll(0);
bool useCpuData = IsInMainThread() && !arg.Model->IsVirtual();
if (!useCpuData)
{
// If mesh data is already cached in memory then we could use it instead of GPU
useCpuData |= arg.Model->HasChunkLoaded(MODEL_LOD_TO_CHUNK_INDEX(lodIndex));
}
bool useCpuData = IsInMainThread() || !arg.Model->IsVirtual();
if (useCpuData)
{
// Read directly from the asset storage