diff options
| author | Bryan Hoyle <starfoxprime@gmail.com> | 2012-08-20 20:59:37 (GMT) |
|---|---|---|
| committer | Bryan Hoyle <starfoxprime@gmail.com> | 2012-08-20 20:59:37 (GMT) |
| commit | a403be989090b3eada9c06b1a68c9b58bd5c1b1b (patch) | |
| tree | 5f4f3cf6b6a95acc24282e3d2954b1cfb71a7e65 /src/game/GameModel.cpp | |
| parent | ede6876a82dc219d68375a54f878685efb963f9b (diff) | |
| parent | 451a94a6ac81e31a5092fef3eed8f5e92cf485f2 (diff) | |
| download | powder-a403be989090b3eada9c06b1a68c9b58bd5c1b1b.zip powder-a403be989090b3eada9c06b1a68c9b58bd5c1b1b.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/PowderToypp
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index d7264ff..d9cbdd7 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -433,6 +433,7 @@ void GameModel::SetSave(SaveInfo * newSave) sim->grav->stop_grav_async(); sim->clear_sim(); sim->SetEdgeMode(0); + ren->ClearAccumulation(); sim->Load(saveData); } notifySaveChanged(); @@ -460,6 +461,8 @@ void GameModel::SetSaveFile(SaveFile * newSave) sim->grav->stop_grav_async(); } sim->clear_sim(); + sim->SetEdgeMode(0); + ren->ClearAccumulation(); sim->Load(saveData); } @@ -623,6 +626,7 @@ void GameModel::FrameStep(int frames) void GameModel::ClearSimulation() { sim->clear_sim(); + ren->ClearAccumulation(); } void GameModel::SetStamp(GameSave * save) |