[Bf-blender-cvs] [4c568286b61] temp-clang-format: Use 2 space indent, brace on same line

[Campbell Barton]

Commit: 4c568286b61fa232acdecf27375c10285f8fcdec
Author: Campbell Barton
Date:   Sat Feb 2 02:04:32 2019 +1100
Branches: temp-clang-format
https://developer.blender.org/rB4c568286b61fa232acdecf27375c10285f8fcdec

Use 2 space indent, brace on same line

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

M	.clang-format

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

diff --git a/.clang-format b/.clang-format
index e1808a6123c..82dc9f139b4 100644
--- a/.clang-format
+++ b/.clang-format
@@ -115,13 +115,13 @@ 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: 4
+ContinuationIndentWidth: 2
 
 # This tries to match Blender's style as much as possible. One
 BreakBeforeBraces: Custom
 BraceWrapping: {
     AfterClass: 'true'
-    AfterControlStatement: 'true'
+    AfterControlStatement: 'false'
     AfterEnum : 'false'
     AfterFunction : 'true'
     AfterNamespace : 'false'
@@ -162,8 +162,8 @@ ReflowComments: false
 # Never use tabs for indentation.
 # Note: TabWidth and IndentWidth must be the same, or strange things happen.
 UseTab: Never
-TabWidth: 4
-IndentWidth: 4
+TabWidth: 2
+IndentWidth: 2
 
 # Add a big penalty on breaking after the return type of functions. For example,
 #