[Bf-blender-cvs] [ca245b2b404] master: ClangFormat: disable for most of sobol.cpp

Campbell Barton noreply at git.blender.org
Wed Apr 17 06:01:17 CEST 2019


Commit: ca245b2b404f33ef3d9368c67c5c8e27eee27e31
Author: Campbell Barton
Date:   Wed Apr 17 06:00:20 2019 +0200
Branches: master
https://developer.blender.org/rBca245b2b404f33ef3d9368c67c5c8e27eee27e31

ClangFormat: disable for most of sobol.cpp

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

M	intern/cycles/render/sobol.cpp
M	source/blender/blenkernel/intern/unit.c

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

diff --git a/intern/cycles/render/sobol.cpp b/intern/cycles/render/sobol.cpp
index b7d6b07de1c..487599476d4 100644
--- a/intern/cycles/render/sobol.cpp
+++ b/intern/cycles/render/sobol.cpp
@@ -58,7 +58,11 @@ typedef struct SobolDirectionNumbers {
 	uint m[SOBOL_MAX_NUMBER];
 } SobolDirectionNumbers;
 
-static SobolDirectionNumbers SOBOL_NUMBERS[SOBOL_MAX_DIMENSIONS-1] = {
+/* Note: this file is skipped by clang-format. */
+
+/* Keep simple alignment. */
+/* clang-format off */
+static SobolDirectionNumbers SOBOL_NUMBERS[SOBOL_MAX_DIMENSIONS - 1] = {
 {2, 1, 0, {1}},
 {3, 2, 1, {1, 3}},
 {4, 3, 1, {1, 3, 1}},
@@ -21260,6 +21264,7 @@ static SobolDirectionNumbers SOBOL_NUMBERS[SOBOL_MAX_DIMENSIONS-1] = {
 {21200, 18, 131020, {1, 1, 5, 1, 19, 1, 83, 3, 425, 873, 1943, 3935, 4257, 14587, 11829, 55217, 21963, 39683}},
 {21201, 18, 131059, {1, 1, 7, 11, 15, 7, 37, 239, 337, 245, 1557, 3681, 7357, 9639, 27367, 26869, 114603, 86317}}
 };
+/* clang-format on */
 
 void sobol_generate_direction_vectors(uint vectors[][SOBOL_BITS], int dimensions)
 {
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index 5c9be274920..196083fc7fa 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -332,7 +332,7 @@ static const struct bUnitCollection *bUnitSystems[][B_UNIT_TYPE_TOT] = {
 	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 };
 
-/* clang-format on*/
+/* clang-format on */
 
 /* internal, has some option not exposed */
 static const bUnitCollection *unit_get_system(int system, int type)



More information about the Bf-blender-cvs mailing list