[Bf-blender-cvs] [0182c7c190c] temp-clang-format: clang-format: disable for parts of unit.c
Campbell Barton
noreply at git.blender.org
Mon Jan 14 07:18:11 CET 2019
Commit: 0182c7c190c1eaba74eba03c6d96f40741dc5c72
Author: Campbell Barton
Date: Mon Jan 14 17:17:31 2019 +1100
Branches: temp-clang-format
https://developer.blender.org/rB0182c7c190c1eaba74eba03c6d96f40741dc5c72
clang-format: disable for parts of unit.c
===================================================================
M source/blender/blenkernel/intern/unit.c
===================================================================
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index a847a658a04..7ba938519b2 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -45,6 +45,9 @@
/* no BKE or DNA includes! */
+/* Keep alignment. */
+/* clang-format off */
+
#define TEMP_STR_SIZE 256
#define SEP_CHR '#'
@@ -83,6 +86,8 @@
#define UN_SC_LB 0.45359237f
#define UN_SC_OZ 0.028349523125f
+/* clang-format on */
+
/* define a single unit */
typedef struct bUnitDef {
const char *name;
@@ -124,6 +129,9 @@ typedef struct bUnitCollection {
int length;
} bUnitCollection;
+/* Keep table lignment. */
+/* clang-format off */
+
#define UNIT_COLLECTION_LENGTH(def) (sizeof(def) / sizeof(bUnitDef) - 1)
#define NULL_UNIT {NULL, NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
@@ -315,7 +323,7 @@ static const struct bUnitCollection *bUnitSystems[][B_UNIT_TYPE_TOT] = {
{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
};
-
+/* clang-format off */
/* 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