Re-enable scene switching again after incorrect merge from develop

This commit is contained in:
Erik Broberg
2016-08-02 20:48:53 -04:00
parent 244c18fdc7
commit 95da433397
2 changed files with 8 additions and 6 deletions
+4 -4
View File
@@ -90,12 +90,12 @@ bool Scene::deinitialize() {
void Scene::update(const UpdateData& data) {
if (!_sceneGraphToLoad.empty()) {
OsEng.renderEngine().scene()->clearSceneGraph();
try {
try {
loadSceneInternal(_sceneGraphToLoad);
// Reset the InteractionManager to Orbital/default mode
// TODO: Decide if it belongs in the scene and/or how it gets reloaded
// OsEng.interactionHandler().setInteractionModeToOrbital();
loadSceneInternal(_sceneGraphToLoad);
OsEng.interactionHandler().setInteractionMode("Orbital");
// After loading the scene, the keyboard bindings have been set