Merge branch 'main' into cgalvan/RemoveLegacyEditTools

2021-04-21 14:54:19 -05:00
parent 0efa1e7817 626f7c00fe
commit 5061f39406
285 changed files with 25667 additions and 1427 deletions
@@ -678,6 +678,11 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
            }
            SetCurrentCursor(STD_CURSOR_GAME);
        }
+
+        if (m_renderViewport)
+        {
+            m_renderViewport->GetControllerList()->SetEnabled(false);
+        }
    }
    break;

@@ -696,6 +701,11 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)

            RestoreViewportAfterGameMode();
        }
+
+        if (m_renderViewport)
+        {
+            m_renderViewport->GetControllerList()->SetEnabled(true);
+        }
        break;

    case eNotify_OnCloseScene:
@@ -726,6 +736,8 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
            // meters above the terrain (default terrain height is 32)
            viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
            SetViewTM(viewTM);
+
+            UpdateScene();
        }
        break;