Resolve merge conflict

src/interaction/interactionmode.cpp

@@ -150,8 +150,11 @@ InteractionMode::~InteractionMode() {
 
 void InteractionMode::setFocusNode(SceneGraphNode* focusNode) {
     _focusNode = focusNode;
-    _previousFocusNodePosition = _focusNode->worldPosition();
-    _previousFocusNodeRotation = glm::quat_cast(_focusNode->worldRotationMatrix());
+
+    if (_focusNode != nullptr) {
+        _previousFocusNodePosition = _focusNode->worldPosition().dvec3();
+        _previousFocusNodeRotation = glm::quat_cast(_focusNode->worldRotationMatrix());
+    }
 }
 
 SceneGraphNode* InteractionMode::focusNode() {

src/scene/scene.cpp

@@ -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