[Bf-blender-cvs] [4cf10ef0557] temp-clang-format: Use 4 spaces for continuations, addresses T53211#611987

Campbell Barton noreply at git.blender.org
Fri Feb 1 23:42:55 CET 2019


Commit: 4cf10ef0557255428ba6563c5d7cd5195778e024
Author: Campbell Barton
Date:   Sat Feb 2 09:44:28 2019 +1100
Branches: temp-clang-format
https://developer.blender.org/rB4cf10ef0557255428ba6563c5d7cd5195778e024

Use 4 spaces for continuations, addresses T53211#611987

Before:

```
  if (
    psmd->mesh_final->totvert != psmd->totdmvert || psmd->mesh_final->totedge != psmd->totdmedge ||
    psmd->mesh_final->totface != psmd->totdmface) {
    psys->recalc |= ID_RECALC_PSYS_RESET;

    psmd->totdmvert = psmd->mesh_final->totvert;
    psmd->totdmedge = psmd->mesh_final->totedge;
    psmd->totdmface = psmd->mesh_final->totface;
  }
```

After:

```
  if (psmd->mesh_final->totvert != psmd->totdmvert ||
      psmd->mesh_final->totedge != psmd->totdmedge ||
      psmd->mesh_final->totface != psmd->totdmface)
  {
    psys->recalc |= ID_RECALC_PSYS_RESET;

    psmd->totdmvert = psmd->mesh_final->totvert;
    psmd->totdmedge = psmd->mesh_final->totedge;
    psmd->totdmface = psmd->mesh_final->totface;
  }
```

===================================================================

M	.clang-format

===================================================================

diff --git a/.clang-format b/.clang-format
index 56538d1f96b..e1ce3e4f7f2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -115,7 +115,7 @@ ConstructorInitializerIndentWidth: 0
 # This will unfortunately use spaces in some cases where it's not desired (like
 # function calls) but the overall result is better since it will allow
 # alignment to work properly with different tab width settings.
-ContinuationIndentWidth: 2
+ContinuationIndentWidth: 4
 
 # This tries to match Blender's style as much as possible. One
 BreakBeforeBraces: Custom



More information about the Bf-blender-cvs mailing list