From 2845995b02b2b62ff65ccc22c4005ba5f1bca500 Mon Sep 17 00:00:00 2001
From: Nikita <69168929+nikitalita@users.noreply.github.com>
Date: Thu, 26 Dec 2024 11:10:36 -0800
Subject: [PATCH] .clang-format: change AllowShortFunctionsOnASingleLine back
 to `Inline`

---
 .clang-format                   | 2 +-
 misc/utility/.clang-format-glsl | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index 46923aae03d..6ca04c43e77 100644
--- a/.clang-format
+++ b/.clang-format
@@ -44,7 +44,7 @@ AllowAllParametersOfDeclarationOnNextLine: false
 # AllowShortBlocksOnASingleLine: Never
 # AllowShortCaseLabelsOnASingleLine: false
 # AllowShortEnumsOnASingleLine: true
-# AllowShortFunctionsOnASingleLine: All
+AllowShortFunctionsOnASingleLine: Inline
 # AllowShortIfStatementsOnASingleLine: Never
 # AllowShortLambdasOnASingleLine: All
 # AllowShortLoopsOnASingleLine: false
diff --git a/misc/utility/.clang-format-glsl b/misc/utility/.clang-format-glsl
index 59efa8fa353..dedd83b1de2 100644
--- a/misc/utility/.clang-format-glsl
+++ b/misc/utility/.clang-format-glsl
@@ -8,6 +8,7 @@ AlignTrailingComments:
   Kind: Never
   OverEmptyLines: 0
 AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: Inline
 BreakConstructorInitializers: AfterColon
 ColumnLimit: 0
 ConstructorInitializerIndentWidth: 8