Merge remote-tracking branch 'origin/gi'

# Conflicts: # Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
2022-06-28 18:16:28 +02:00
parent d861518d2e fe6226b276
commit b1640515c4
95 changed files with 2768 additions and 2416 deletions
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -1409,6 +1409,7 @@ namespace FlaxEditor.Viewport
            new ViewModeOptions(ViewMode.QuadOverdraw, "Quad Overdraw"),
            new ViewModeOptions(ViewMode.GlobalSDF, "Global SDF"),
            new ViewModeOptions(ViewMode.GlobalSurfaceAtlas, "Global Surface Atlas"),
+            new ViewModeOptions(ViewMode.GlobalIllumination, "Global Illumination"),
        };

        private void WidgetCamSpeedShowHide(Control cm)