Integrating github/staging through commit ab87ed9

Code/Sandbox/Editor/Objects/BaseObject.cpp

@@ -165,7 +165,6 @@ private:
     {
         CObjectManager* pObjectManager = static_cast<CObjectManager*>(GetIEditor()->GetObjectManager());
         CBaseObject* pObject = pObjectManager->FindObject(m_attachedObjectGUID);
-        CBaseObject* pParentObject = pObjectManager->FindObject(m_parentObjectGUID);
 
         if (pObject)
         {
@@ -2818,7 +2817,6 @@ void CBaseObject::SetWorldTM(const Matrix34& tm, int flags)
 //////////////////////////////////////////////////////////////////////////
 void CBaseObject::UpdateVisibility(bool bVisible)
 {
-    bool bVisibleWithSpec = bVisible && !IsHiddenBySpec();
     if (bVisible == CheckFlags(OBJFLAG_INVISIBLE))
     {
         if (IObjectManager* objectManager = GetObjectManager())
@@ -3180,8 +3178,6 @@ bool CBaseObject::IntersectRayMesh(const Vec3& raySrc, const Vec3& rayDir, SRayH
         return false;
     }
 
-    int cntSlots = pRenderNode->GetSlotCount();
-
     Matrix34A worldTM;
     IStatObj* pStatObj = pRenderNode->GetEntityStatObj(0, 0, &worldTM);
     if (!pStatObj)

Code/Sandbox/Editor/Objects/DisplayContextShared.inl

@@ -539,7 +539,6 @@ void DisplayContext::DrawHalfDottedCircle(const Vec3& pos, float radius, const V
 void DisplayContext::DrawDottedCircle(const Vec3& pos, float radius, const Vec3& nUnchangedAxis, int numberOfArrows /*=0*/, float stepDegree /*= 1*/)
 {
     float startAngleRadians = 0;
-    float sweepAngleRadians = 2 * gf_PI;
 
     Vec3 a;
     Vec3 b;
@@ -892,8 +891,8 @@ void DisplayContext::DrawDottedLine(const Vec3& p1, const Vec3& p2, [[maybe_unus
 //////////////////////////////////////////////////////////////////////////
 void DisplayContext::PushMatrix(const Matrix34& tm)
 {
-    assert(m_currentMatrix < 32);
-    if (m_currentMatrix < 32)
+    assert(m_currentMatrix < 31);
+    if (m_currentMatrix < 31)
     {
         m_currentMatrix++;
         m_matrixStack[m_currentMatrix] = m_matrixStack[m_currentMatrix - 1] * tm;

Code/Sandbox/Editor/Objects/EntityObject.cpp

@@ -1881,7 +1881,6 @@ CMaterial* CEntityObject::GetRenderMaterial() const
 //////////////////////////////////////////////////////////////////////////
 void CEntityObject::SetHelperScale(float scale)
 {
-    bool bChanged = m_helperScale != scale;
     m_helperScale = scale;
 }
 
@@ -2034,8 +2033,6 @@ void CEntityObject::ApplyOptics(const QString& opticsFullName, IOpticsElementBas
 //////////////////////////////////////////////////////////////////////////
 void CEntityObject::SetOpticsName(const QString& opticsFullName)
 {
-    bool bUpdateOpticsProperty = true;
-
     if (opticsFullName.isEmpty())
     {
         CDLight* pLight = GetLightProperty();

Code/Sandbox/Editor/Objects/ObjectManager.cpp

@@ -411,9 +411,6 @@ void    CObjectManager::DeleteObject(CBaseObject* obj)
     obj->GetBoundBox(objAAB);
     GetIEditor()->GetGameEngine()->OnAreaModified(objAAB);
 
-    // Release game resources.
-    CBaseObject* pParent = obj->GetParent();
-
     obj->Done();
 
     NotifyObjectListeners(obj, CBaseObject::ON_DELETE);

Code/Sandbox/Editor/Objects/StatObjValidator.cpp

@@ -159,8 +159,6 @@ void CStatObjValidator::Validate(IStatObj* statObj, CMaterial* editorMaterial)
         }
     }
 
-    const char* errorText = 0;
-    const char* nodeName = 0;
     if (statObj && editorMaterial)
     {
         std::vector<SMeshMaterialIssue> issues;

Code/Sandbox/Editor/Objects/TrackGizmo.cpp

@@ -71,8 +71,6 @@ void CTrackGizmo::Display(DisplayContext& dc)
         return;
     }
 
-    uint32 hideMask = gSettings.objectHideMask;
-
     CAnimationContext* ac = GetIEditor()->GetAnimation();
 
     // Should have animation sequence.
@@ -236,7 +234,6 @@ void CTrackGizmo::DrawKeys(DisplayContext& dc, CTrackViewTrack* pTrack, CTrackVi
 
     float zOffset = TRACK_DRAW_Z_OFFSET;
 
-    float sz = 0.2f;
     int nkeys = pKeysTrack->GetKeyCount();
     for (int i = 0; i < nkeys; i++)
     {