Merge branch 'multiple_physics_scenes' of git://github.com/iainmckay/FlaxEngine into iainmckay-multiple_physics_scenes

2022-01-10 20:13:55 +01:00
parent 7dd97a2d9f 498040765b
commit 8a3cfb36d0
29 changed files with 2359 additions and 1350 deletions
--- a/Source/Editor/States/PlayingState.cs
+++ b/Source/Editor/States/PlayingState.cs
@@ -156,7 +156,7 @@ namespace FlaxEditor.States
        private void SetupEditorEnvOptions()
        {
            Time.TimeScale = 1.0f;
-            Physics.AutoSimulation = true;
+            Physics.DefaultScene.AutoSimulation = true;
            Screen.CursorVisible = true;
            Screen.CursorLock = CursorLockMode.None;
        }