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