Integrating up through commit 90f050496

This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -231,6 +231,8 @@ namespace AZ::AtomBridge
AZ::RPI::AuxGeomDrawPtr m_auxGeomPtr;
bool m_defaultInstance = false; // only true for drawing to a particular viewport. What would 2D drawing mean in a scene with several windows?
AzFramework::ViewportId m_viewportId = AzFramework::InvalidViewportId; // Address this instance answers on.
AZ::RPI::ViewportContext::SceneChangedEvent::Handler
m_sceneChangeHandler;
};
// this is duplicated from Cry_Math.h, GetBasisVectors.