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

Merge remote-tracking branch 'origin/master' into 1.7

Browse Source 
# Conflicts:
#	Source/Editor/Viewport/PrefabWindowViewport.cs
#	Source/Engine/Physics/PhysX/SimulationEventCallbackPhysX.cpp
This commit is contained in:
Wojtek Figat
2023-09-28 20:42:54 +02:00
parent 46e00af723 310d61edda
commit 58b9d76d24
34 changed files with 1580 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,9 +13,11 @@ namespace
{
void ClearColliderFromCollection(const PhysicsColliderActor* collider, Array<SimulationEventCallback::CollidersPair>& collection)
{
const auto c = collection.Get();
for (int32 i = 0; i < collection.Count(); i++)
{
if (collection[i].First == collider || collection[i].Second == collider)
const SimulationEventCallback::CollidersPair cc = c[i];
if (cc.First == collider || cc.Second == collider)
{
collection.RemoveAt(i--);
if (collection.IsEmpty())