Merge remote-tracking branch 'origin/master' into 1.13

# Conflicts: # Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
2026-08-05 08:12:00 +02:00
parent 449c58a05d 70498fa42c
commit 49cb39e1f1
38 changed files with 1420 additions and 120 deletions
@@ -40,6 +40,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
            var codeEditing = Editor.Instance.CodeEditing;
            var vsCode = codeEditing.GetInBuildEditor(CodeEditorTypes.VSCode);
            var rider = codeEditing.GetInBuildEditor(CodeEditorTypes.Rider);
+            var clion = codeEditing.GetInBuildEditor(CodeEditorTypes.CLion);

 #if PLATFORM_WINDOWS
            // Favor the newest Visual Studio
@@ -66,6 +67,8 @@ namespace FlaxEditor.Modules.SourceCodeEditing
                _currentEditor = vsCode;
            else if (rider != null)
                _currentEditor = rider;
+            else if (clion != null)
+                _currentEditor = clion;
            else
                _currentEditor = codeEditing.GetInBuildEditor(CodeEditorTypes.SystemDefault);
        }