Integrating github/staging through commit 5f214be

Code/Sandbox/Editor/Controls/ColorGradientCtrl.cpp

@@ -137,10 +137,6 @@ void CColorGradientCtrl::PointToTimeValue(QPoint point, float& time, ISplineInte
 float CColorGradientCtrl::XOfsToTime(int x)
 {
     return m_grid.ClientToWorld(QPoint(x, 0)).x;
-
-    // m_fMinTime to m_fMaxTime time range.
-    float time = m_fMinTime + (float)((m_fMaxTime - m_fMinTime) * (x - m_rcGradient.left())) / m_rcGradient.width();
-    return time;
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp

@@ -672,7 +672,6 @@ CReflectedVar * ReflectedPropertyControl::GetReflectedVarFromCallbackInstance(Az
         return reinterpret_cast<CReflectedVar *>(pNode->GetInstance(0));
     else
         return GetReflectedVarFromCallbackInstance(pNode->GetParent());
-    return nullptr;
 }