Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -998,7 +998,6 @@ CBaseObject* CEditorImpl::CloneObject(CBaseObject* obj)

 CBaseObject* CEditorImpl::GetSelectedObject()
 {
-    CBaseObject* obj = nullptr;
    if (m_pObjectManager->GetSelection()->GetCount() != 1)
    {
        return nullptr;