mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-03 09:20:26 -05:00
Re-enable scene switching again after incorrect merge from develop
This commit is contained in:
+4
-4
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user