Merge branch 'etternalmemestatus' of https://github.com/etternagame/etterna.git into etternalmemestatus

Author: MinaciousGrace

src/RageDisplay_D3D.cpp

@@ -857,7 +857,7 @@ class RageCompiledGeometrySWD3D : public RageCompiledGeometry
 			meshInfo.iVertexCount,		// NumVertices
 			meshInfo.iTriangleCount,	// PrimitiveCount,
 			&m_vTriangles[0]+meshInfo.iTriangleStart,// pIndexData,
-			D3DFMT_INDEX32,				// IndexDataFormat,
+			D3DFMT_INDEX16,				// IndexDataFormat,
 			&m_vVertex[0],				// pVertexStreamZeroData,
 			sizeof(m_vVertex[0])		// VertexStreamZeroStride
 		);

src/Song.cpp

@@ -1068,6 +1068,10 @@ void Song::ReCalculateRadarValuesAndLastSecond(bool fromCache, bool duringCache)
 		for (auto& n : m_vpSteps) {
 			// Cache etterna stuff and 'radar values'
 
+			// Skip difficulties without notes
+			if (n->IsNoteDataEmpty())
+				continue;
+
 			// only ever decompress the notedata when writing the cache file
 			// for this we don't use the etterna compressed format -mina
 			n->Decompress();