birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101 from aws-lumberyard-dev/non-uniform-scale-event-handlers

Browse Source 
fixing bugs with failing to disconnect from non-uniform scale event h…
This commit is contained in:
greerdv
2021-04-16 19:13:42 +01:00
committed by GitHub
parent d2efdf5c63 1363a5b76c
commit 9c4d8513f1
5 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.cpp
+1
View File
@@ -65,6 +65,7 @@ namespace LmbrCentral
ShapeComponentNotificationsBus::Handler::BusDisconnect();
PolygonPrismShapeComponentNotificationBus::Handler::BusDisconnect();
AZ::TransformNotificationBus::Handler::BusDisconnect();
m_nonUniformScaleChangedHandler.Disconnect();
DestroyManipulators();
}
Gems/PhysX/Code/Source/EditorColliderComponent.cpp
+2
View File
@@ -391,6 +391,8 @@ namespace PhysX
Physics::WorldBodyRequestBus::Handler::BusDisconnect();
m_colliderDebugDraw.Disconnect();
AZ::Data::AssetBus::MultiHandler::BusDisconnect();
m_nonUniformScaleChangedHandler.Disconnect();
EditorColliderComponentRequestBus::Handler::BusDisconnect();
AZ::Render::MeshComponentNotificationBus::Handler::BusDisconnect();
LmbrCentral::MeshComponentNotificationBus::Handler::BusDisconnect();
ColliderShapeRequestBus::Handler::BusDisconnect();
Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
+1
View File
@@ -277,6 +277,7 @@ namespace PhysX
force.Deactivate();
}
m_nonUniformScaleChangedHandler.Disconnect();
AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect();
EditorComponentBase::Deactivate();
}
Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
+1
View File
@@ -273,6 +273,7 @@ namespace PhysX
m_debugDisplayDataChangeHandler.Disconnect();
Physics::WorldBodyRequestBus::Handler::BusDisconnect();
m_nonUniformScaleChangedHandler.Disconnect();
m_sceneStartSimHandler.Disconnect();
Physics::ColliderComponentEventBus::Handler::BusDisconnect();
AZ::TransformNotificationBus::Handler::BusDisconnect();
Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
+1
View File
@@ -666,6 +666,7 @@ namespace PhysX
Physics::WorldBodyRequestBus::Handler::BusDisconnect();
m_colliderDebugDraw.Disconnect();
m_nonUniformScaleChangedHandler.Disconnect();
PhysX::ColliderShapeRequestBus::Handler::BusDisconnect();
LmbrCentral::ShapeComponentNotificationsBus::Handler::BusDisconnect();
AZ::TransformNotificationBus::Handler::BusDisconnect();