Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_ccg.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/BKE_ccg.h')
-rw-r--r--source/blender/blenkernel/BKE_ccg.h67
1 files changed, 33 insertions, 34 deletions
diff --git a/source/blender/blenkernel/BKE_ccg.h b/source/blender/blenkernel/BKE_ccg.h
index ec8caaf9f7b..ebea8dcbd22 100644
--- a/source/blender/blenkernel/BKE_ccg.h
+++ b/source/blender/blenkernel/BKE_ccg.h
@@ -43,29 +43,29 @@ struct CCGSubSurf;
typedef struct CCGElem CCGElem;
typedef struct CCGKey {
- int level;
+ int level;
- /* number of bytes in each element (one float per layer, plus
- * three floats for normals if enabled) */
- int elem_size;
+ /* number of bytes in each element (one float per layer, plus
+ * three floats for normals if enabled) */
+ int elem_size;
- /* number of elements along each side of grid */
- int grid_size;
- /* number of elements in the grid (grid size squared) */
- int grid_area;
- /* number of bytes in each grid (grid_area * elem_size) */
- int grid_bytes;
+ /* number of elements along each side of grid */
+ int grid_size;
+ /* number of elements in the grid (grid size squared) */
+ int grid_area;
+ /* number of bytes in each grid (grid_area * elem_size) */
+ int grid_bytes;
- /* currently always the last three floats, unless normals are
- * disabled */
- int normal_offset;
+ /* currently always the last three floats, unless normals are
+ * disabled */
+ int normal_offset;
- /* offset in bytes of mask value; only valid if 'has_mask' is
- * true */
- int mask_offset;
+ /* offset in bytes of mask value; only valid if 'has_mask' is
+ * true */
+ int mask_offset;
- int has_normals;
- int has_mask;
+ int has_normals;
+ int has_mask;
} CCGKey;
/* initialize 'key' at the specified level */
@@ -94,70 +94,69 @@ BLI_INLINE float *CCG_elem_offset_mask(const CCGKey *key, CCGElem *elem, int off
/* for iteration, get a pointer to the next element in an array */
BLI_INLINE CCGElem *CCG_elem_next(const CCGKey *key, CCGElem *elem);
-
/* inline definitions follow */
BLI_INLINE float *CCG_elem_co(const CCGKey *UNUSED(key), CCGElem *elem)
{
- return (float *)elem;
+ return (float *)elem;
}
BLI_INLINE float *CCG_elem_no(const CCGKey *key, CCGElem *elem)
{
- BLI_assert(key->has_normals);
- return (float *)((char *)elem + key->normal_offset);
+ BLI_assert(key->has_normals);
+ return (float *)((char *)elem + key->normal_offset);
}
BLI_INLINE float *CCG_elem_mask(const CCGKey *key, CCGElem *elem)
{
- BLI_assert(key->has_mask);
- return (float *)((char *)elem + (key->mask_offset));
+ BLI_assert(key->has_mask);
+ return (float *)((char *)elem + (key->mask_offset));
}
BLI_INLINE CCGElem *CCG_elem_offset(const CCGKey *key, CCGElem *elem, int offset)
{
- return (CCGElem *)(((char *)elem) + key->elem_size * offset);
+ return (CCGElem *)(((char *)elem) + key->elem_size * offset);
}
BLI_INLINE CCGElem *CCG_grid_elem(const CCGKey *key, CCGElem *elem, int x, int y)
{
-// BLI_assert(x < key->grid_size && y < key->grid_size);
- return CCG_elem_offset(key, elem, (y * key->grid_size + x));
+ // BLI_assert(x < key->grid_size && y < key->grid_size);
+ return CCG_elem_offset(key, elem, (y * key->grid_size + x));
}
BLI_INLINE float *CCG_grid_elem_co(const CCGKey *key, CCGElem *elem, int x, int y)
{
- return CCG_elem_co(key, CCG_grid_elem(key, elem, x, y));
+ return CCG_elem_co(key, CCG_grid_elem(key, elem, x, y));
}
BLI_INLINE float *CCG_grid_elem_no(const CCGKey *key, CCGElem *elem, int x, int y)
{
- return CCG_elem_no(key, CCG_grid_elem(key, elem, x, y));
+ return CCG_elem_no(key, CCG_grid_elem(key, elem, x, y));
}
BLI_INLINE float *CCG_grid_elem_mask(const CCGKey *key, CCGElem *elem, int x, int y)
{
- return CCG_elem_mask(key, CCG_grid_elem(key, elem, x, y));
+ return CCG_elem_mask(key, CCG_grid_elem(key, elem, x, y));
}
BLI_INLINE float *CCG_elem_offset_co(const CCGKey *key, CCGElem *elem, int offset)
{
- return CCG_elem_co(key, CCG_elem_offset(key, elem, offset));
+ return CCG_elem_co(key, CCG_elem_offset(key, elem, offset));
}
BLI_INLINE float *CCG_elem_offset_no(const CCGKey *key, CCGElem *elem, int offset)
{
- return CCG_elem_no(key, CCG_elem_offset(key, elem, offset));
+ return CCG_elem_no(key, CCG_elem_offset(key, elem, offset));
}
BLI_INLINE float *CCG_elem_offset_mask(const CCGKey *key, CCGElem *elem, int offset)
{
- return CCG_elem_mask(key, CCG_elem_offset(key, elem, offset));
+ return CCG_elem_mask(key, CCG_elem_offset(key, elem, offset));
}
BLI_INLINE CCGElem *CCG_elem_next(const CCGKey *key, CCGElem *elem)
{
- return CCG_elem_offset(key, elem, 1);
+ return CCG_elem_offset(key, elem, 1);
}
#endif