Integrating github/staging through commit ab87ed9

Code/Sandbox/Plugins/EditorCommon/ManipScene.cpp

@@ -124,8 +124,6 @@ namespace Manip
         QuatT transform = spaceProvider->ElementToWorldSpace(element);
         Matrix34 transformM(transform);
 
-        bool isHighlighted = element.id == highlightedItem;
-
         if (element.shape == SHAPE_BOX)
         {
             OBB obb;
@@ -217,10 +215,6 @@ namespace Manip
 
     void CScene::OnViewportRender(const SRenderContext& rc)
     {
-        IRenderer* renderer = GetIEditor()->GetRenderer();
-        IRenderAuxGeom* aux = renderer->GetIRenderAuxGeom();
-
-
         SignalRenderElements(m_elements, rc);
 
         for (int xRayPass = 0; xRayPass < 2; ++xRayPass)