merge

src/NotesLoaderSSC.cpp

@@ -566,7 +566,6 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
 				{
 					// Process timings and convert negative bpms/stops
 					SMLoader::ProcessBPMsAndStops(out.m_SongTiming, vBPMChanges, vStops);
-					vBPMChanges.clear();
 
 					state = GETTING_STEP_INFO;
 					pNewNotes = out.CreateSteps();
@@ -811,7 +810,6 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
 					{
 						bHasOwnTiming = true;
 						SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
-						vBPMChanges.clear();
 					}
 
 					state = GETTING_SONG_INFO;

src/Song.cpp

@@ -42,7 +42,7 @@
  * @brief The internal version of the cache for StepMania.
  *
  * Increment this value to invalidate the current cache. */
-const int FILE_CACHE_VERSION = 211;
+const int FILE_CACHE_VERSION = 212;
 
 /** @brief How long does a song sample last by default? */
 const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;