From dd77e4515159187cf188706d53c6769e62346a21 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 23 Feb 2018 12:59:02 +1100 Subject: Cleanup: header guards & style --- source/blender/blenkernel/BKE_modifier.h | 4 ++-- source/blender/blenlib/BLI_polyfill_2d_beautify.h | 6 +++--- source/blender/blenlib/BLI_voronoi_2d.h | 6 +++--- source/blender/blenlib/intern/boxpack_2d.c | 2 +- source/blender/blenlib/intern/jitter_2d.c | 2 +- source/blender/blenlib/intern/polyfill_2d_beautify.c | 2 +- source/blender/depsgraph/intern/builder/deg_builder_map.cc | 2 +- source/blender/depsgraph/intern/builder/deg_builder_map.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index b5f72b0774e..b0917e4f6cd 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -278,7 +278,7 @@ typedef struct ModifierTypeInfo { * This function is optional. */ void (*updateDepgraph)(struct ModifierData *md, - const ModifierUpdateDepsgraphContext* ctx); + const ModifierUpdateDepsgraphContext *ctx); /* Add the appropriate relations to the dependency graph. * @@ -286,7 +286,7 @@ typedef struct ModifierTypeInfo { */ /* TODO(sergey): Remove once we finally switched to the new depsgraph. */ void (*updateDepsgraph)(struct ModifierData *md, - const ModifierUpdateDepsgraphContext* ctx); + const ModifierUpdateDepsgraphContext *ctx); /* Should return true if the modifier needs to be recalculated on time * changes. diff --git a/source/blender/blenlib/BLI_polyfill_2d_beautify.h b/source/blender/blenlib/BLI_polyfill_2d_beautify.h index 278771e9611..73b52125904 100644 --- a/source/blender/blenlib/BLI_polyfill_2d_beautify.h +++ b/source/blender/blenlib/BLI_polyfill_2d_beautify.h @@ -18,8 +18,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __BLI_POLYFILL2D_BEAUTIFY_H__ -#define __BLI_POLYFILL2D_BEAUTIFY_H__ +#ifndef __BLI_POLYFILL_2D_BEAUTIFY_H__ +#define __BLI_POLYFILL_2D_BEAUTIFY_H__ struct Heap; struct MemArena; @@ -42,4 +42,4 @@ float BLI_polyfill_beautify_quad_rotate_calc_ex( /* avoid realloc's when creating new structures for polyfill ngons */ #define BLI_POLYFILL_ALLOC_NGON_RESERVE 64 -#endif /* __BLI_POLYFILL2D_BEAUTIFY_H__ */ +#endif /* __BLI_POLYFILL_2D_BEAUTIFY_H__ */ diff --git a/source/blender/blenlib/BLI_voronoi_2d.h b/source/blender/blenlib/BLI_voronoi_2d.h index 51d1d5aa88e..8d1ff2d4c2b 100644 --- a/source/blender/blenlib/BLI_voronoi_2d.h +++ b/source/blender/blenlib/BLI_voronoi_2d.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __BLI_VORONOI_H__ -#define __BLI_VORONOI_H__ +#ifndef __BLI_VORONOI_2D_H__ +#define __BLI_VORONOI_2D_H__ struct ListBase; @@ -67,4 +67,4 @@ void BLI_voronoi_triangulate(const VoronoiSite *sites, int sites_total, struct L VoronoiTriangulationPoint **triangulated_points_r, int *triangulated_points_total_r, int (**triangles_r)[3], int *triangles_total_r); -#endif /* __BLI_VORONOI_H__ */ +#endif /* __BLI_VORONOI_2D_H__ */ diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c index b3beff0b78b..cf9e29209fb 100644 --- a/source/blender/blenlib/intern/boxpack_2d.c +++ b/source/blender/blenlib/intern/boxpack_2d.c @@ -20,7 +20,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/blenlib/intern/boxpack2d.c +/** \file blender/blenlib/intern/boxpack_2d.c * \ingroup bli */ diff --git a/source/blender/blenlib/intern/jitter_2d.c b/source/blender/blenlib/intern/jitter_2d.c index 6c51eeb36d9..26351f52c7f 100644 --- a/source/blender/blenlib/intern/jitter_2d.c +++ b/source/blender/blenlib/intern/jitter_2d.c @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/blenlib/intern/jitter.c +/** \file blender/blenlib/intern/jitter_2d.c * \ingroup bli * \brief Jitter offset table */ diff --git a/source/blender/blenlib/intern/polyfill_2d_beautify.c b/source/blender/blenlib/intern/polyfill_2d_beautify.c index 93bfb02bce4..9eb2ebc0bab 100644 --- a/source/blender/blenlib/intern/polyfill_2d_beautify.c +++ b/source/blender/blenlib/intern/polyfill_2d_beautify.c @@ -18,7 +18,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/blenlib/intern/polyfill2d_beautify.c +/** \file blender/blenlib/intern/polyfill_2d_beautify.c * \ingroup bli * * This function is to improve the tessellation resulting from polyfill2d, diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.cc b/source/blender/depsgraph/intern/builder/deg_builder_map.cc index 8c8446c1686..67cb04d1b98 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_map.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_map.cc @@ -24,7 +24,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/depsgraph/intern/builder/deg_builder.cc +/** \file blender/depsgraph/intern/builder/deg_builder_map.cc * \ingroup depsgraph */ diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.h b/source/blender/depsgraph/intern/builder/deg_builder_map.h index 0e6d7c81396..5ad22a9aa77 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_map.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_map.h @@ -24,7 +24,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/depsgraph/intern/builder/deg_builder.h +/** \file blender/depsgraph/intern/builder/deg_builder_map.h * \ingroup depsgraph */ -- cgit v1.2.3