diff options
| author | Sergey Sharybin <sergey@blender.org> | 2022-10-07 15:52:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2022-10-07 15:55:23 +0300 |
| commit | 7383c6c309ca7c474253b7e50cc5042e23e2eb40 (patch) | |
| tree | e5583c8951015df2d4765ba695fcc2e759d47aa1 /.clang-format | |
| parent | a56a90a8e2f3f029b9828ffaea21edc3e6679014 (diff) | |
| parent | 87ef423e6ebdb90e0e8937b7e749d470a000b3e4 (diff) | |
Merge branch 'master' into tracking_toolstracking_tools
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.clang-format b/.clang-format index f7b785adaf2..72add4594a4 100644 --- a/.clang-format +++ b/.clang-format @@ -265,11 +265,13 @@ ForEachMacros: - SET_SLOT_PROBING_BEGIN - MAP_SLOT_PROBING_BEGIN - VECTOR_SET_SLOT_PROBING_BEGIN + - WL_ARRAY_FOR_EACH + - FOREACH_SPECTRUM_CHANNEL StatementMacros: - PyObject_HEAD - PyObject_VAR_HEAD - ccl_gpu_kernel_postfix -MacroBlockBegin: "^BSDF_CLOSURE_CLASS_BEGIN$" -MacroBlockEnd: "^BSDF_CLOSURE_CLASS_END$" +MacroBlockBegin: "^OSL_CLOSURE_STRUCT_BEGIN$" +MacroBlockEnd: "^OSL_CLOSURE_STRUCT_END$" |