diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-10-29 15:43:21 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-10-29 15:43:21 -0700 |
| commit | 74b0c86e48387e2154cb2acf03f626ca11229bce (patch) | |
| tree | 0c74138a6d0c60eb5dffcc745464b58a6b315036 /.clang-format | |
| parent | 9598e2f4cedd3dc36d447086273e0ed97967bbf9 (diff) | |
| parent | 1a7909517368206d54407e54b9332aed1e4c9863 (diff) | |
Merge brad/2549-downrez-controls into release/2024.09-ExtraFPS (#2864)
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.clang-format b/.clang-format index 90124fb04b..f5a49845d0 100644 --- a/.clang-format +++ b/.clang-format @@ -2,7 +2,7 @@ # clang-format version 10.0.0+ Language: Cpp # BasedOnStyle: Microsoft -AccessModifierOffset: -2 +AccessModifierOffset: -4 AlignAfterOpenBracket: Align AlignConsecutiveMacros: true AlignConsecutiveAssignments: true @@ -15,14 +15,14 @@ AllowAllConstructorInitializersOnNextLine: false AllowAllParametersOfDeclarationOnNextLine: false AllowShortBlocksOnASingleLine: Always AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: All -AllowShortLambdasOnASingleLine: All +AllowShortFunctionsOnASingleLine: InlineOnly +AllowShortLambdasOnASingleLine: Inline AllowShortIfStatementsOnASingleLine: Never AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: MultiLine +AlwaysBreakTemplateDeclarations: Yes BinPackArguments: true BinPackParameters: true BreakBeforeBinaryOperators: None @@ -67,7 +67,7 @@ IndentCaseLabels: true IndentGotoLabels: true IndentPPDirectives: None IndentWidth: 4 -IndentWrappedFunctionNames: false +IndentWrappedFunctionNames: true JavaScriptQuotes: Leave JavaScriptWrapImports: true KeepEmptyLinesAtTheStartOfBlocks: false @@ -91,9 +91,9 @@ PointerAlignment: Left ReflowComments: true SortIncludes: false SortUsingDeclarations: true -SpaceAfterCStyleCast: true +SpaceAfterCStyleCast: false SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: true +SpaceAfterTemplateKeyword: false SpaceBeforeAssignmentOperators: true SpaceBeforeCpp11BracedList: false SpaceBeforeCtorInitializerColon: true @@ -102,8 +102,8 @@ SpaceBeforeParens: ControlStatements SpaceBeforeRangeBasedForLoopColon: true SpaceInEmptyBlock: false SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 2 -SpacesInAngles: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: Never SpacesInContainerLiterals: false SpacesInCStyleCastParentheses: false SpacesInParentheses: false |