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

Browse Source 
# Conflicts:
#	Source/Engine/Physics/PhysX/SimulationEventCallbackPhysX.cpp
This commit is contained in:
Wojtek Figat
2023-09-13 10:29:28 +02:00
parent cb2ed817a2 963c12a75f
commit 6bdbaecc18
22 changed files with 1328 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Physics/PhysX/SimulationEventCallbackPhysX.cpp
View File

@@ -11,8 +11,10 @@
namespace
{
void ClearColliderFromCollection(PhysicsColliderActor* collider, Array<SimulationEventCallback::CollidersPair>& collection)
void ClearColliderFromCollection(const PhysicsColliderActor* collider, Array<SimulationEventCallback::CollidersPair>& collection)
{
if (collection.IsEmpty())
return;
for (int32 i = 0; i < collection.Count(); i++)
{
if (collection[i].First == collider || collection[i].Second == collider)