Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -247,8 +247,6 @@ void CExportManager::AddEntityAnimationData(const CTrackViewTrack* pTrack, Expor
float fOutTantentX = tout[0];
float fOutTantentY = tout[1];
float fTangentDelta = 0.01f;
if (fInTantentX == 0.0f)
{
fInTantentX = kTangentDelta;
@@ -789,8 +787,6 @@ bool CExportManager::ProcessObjectsForExport()
float fpsTimeInterval = 1.0f / m_FBXBakedExportFPS;
float timeValue = 0.0f;
IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
GetIEditor()->GetAnimation()->SetRecording(false);
GetIEditor()->GetAnimation()->SetPlaying(false);
@@ -814,7 +810,6 @@ bool CExportManager::ProcessObjectsForExport()
if (QString::compare(pObj2->name, kMasterCameraName) == 0)
{
REFGUID camGUID = GetIEditor()->GetViewManager()->GetCameraObjectId();
pObject = GetIEditor()->GetObjectManager()->FindObject(GetIEditor()->GetViewManager()->GetCameraObjectId());
}
else