archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

ClangFormat: disable for most of sobol.cpp

Browse Source
This commit is contained in:
Campbell Barton
2019-04-17 06:00:20 +02:00
parent 5d8030b8f3
commit ca245b2b40
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/render/sobol.cpp
View File

@@ -58,7 +58,11 @@ typedef struct SobolDirectionNumbers {
uint m[SOBOL_MAX_NUMBER]; uint m[SOBOL_MAX_NUMBER];
} SobolDirectionNumbers; } 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}}, {2, 1, 0, {1}},
{3, 2, 1, {1, 3}}, {3, 2, 1, {1, 3}},
{4, 3, 1, {1, 3, 1}}, {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}}, {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}} {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) void sobol_generate_direction_vectors(uint vectors[][SOBOL_BITS], int dimensions)
{ {

2
source/blender/blenkernel/intern/unit.c
View File

@@ -332,7 +332,7 @@ static const struct bUnitCollection *bUnitSystems[][B_UNIT_TYPE_TOT] = {
{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
}; };
/* clang-format on*/ /* clang-format on */
/* internal, has some option not exposed */ /* internal, has some option not exposed */
static const bUnitCollection *unit_get_system(int system, int type) static const bUnitCollection *unit_get_system(int system, int type)