diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-27 07:31:48 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-27 07:34:14 +0200 |
| commit | 4226d56ca9ec91c4878d47e3bce4784e5edc3006 (patch) | |
| tree | 92a34cf9488067658e5f32da6d48bd5869a40c6b /misc/travis | |
| parent | db55d8a4b6ad6c14f2131e02b50689eb8380276f (diff) | |
| download | redot-engine-4226d56ca9ec91c4878d47e3bce4784e5edc3006.tar.gz | |
Style: Enable clang-format on GLSL shaders
As of clang-format 6.0.1, putting the `/* clang-format off */` hint
around our "invalid" `[vertex]` and `[shader]` statements isn't enough
to prevent a bogus indent of the next comments and first valid statement,
so we need to enclose that first valid statement in the unformatted chunk.
Diffstat (limited to 'misc/travis')
| -rwxr-xr-x | misc/travis/clang-format.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/travis/clang-format.sh b/misc/travis/clang-format.sh index 5463998720..ee4d0b2a10 100755 --- a/misc/travis/clang-format.sh +++ b/misc/travis/clang-format.sh @@ -11,7 +11,7 @@ else RANGE=HEAD fi -FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java)$") +FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java|glsl)$") echo "Checking files:\n$FILES" # create a random filename to store our generated patch |