merge

2011-05-20 22:15:27 +07:00
parent 73459aae38 b074acc0cb
commit bc35a75672
1 changed files with 6 additions and 8 deletions
@@ -900,8 +900,6 @@ void NoteField::DrawPrimitives()
 		}
 		
 		// Warp text
-		if( GAMESTATE->m_bIsUsingStepTiming )
-		{
 		FOREACH_CONST( WarpSegment, timing.m_WarpSegments, seg )
 		{
 			if( seg->m_iStartRow >= iFirstRowToDraw && seg->m_iStartRow <= iLastRowToDraw )
@@ -911,7 +909,7 @@ void NoteField::DrawPrimitives()
 					DrawWarpText( fBeat, seg->m_fLengthBeats );
 			}
 		}
-		}
+		
 		
 		// Time Signature text
 		FOREACH_CONST( TimeSignatureSegment, timing.m_vTimeSignatureSegments, seg )