actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[opengl] merge (part 2)

Browse Source
This commit is contained in:
Colby Klein
2011-03-16 23:35:47 -07:00
parent 0c457ba55b
commit 53865866d3
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEdit.cpp
+2 -2
View File
@@ -2867,8 +2867,8 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
if( (*s)->IsAutogen() ) if( (*s)->IsAutogen() )
continue; continue;
// If the notedata has content, let it go. // If the notedata has content, let it go.
if( !(*s)->m_NoteData->IsEmpty() ) // if( !(*s)->m_NoteData->IsEmpty() )
continue; // continue;
// It's hard to say if these steps were saved to disk or not. // It's hard to say if these steps were saved to disk or not.
/* /*
if( !(*s)->GetSavedToDisk() ) if( !(*s)->GetSavedToDisk() )
src/StepMania.cpp
-2
View File
@@ -1567,5 +1567,3 @@ void HandleInputEvents(float fDeltaTime)
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
>>>>>>> other