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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-12-06 17:35:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-12-06 17:35:53 +0300
commiteeaf45238117a81b07552bfc6fa70a304bfc4f83 (patch)
treebf707b49d6f90c12bbed1fbc546999bc862da12c /source
parent15abc9fe743e09f2ec7ef3a6bcfb8f4954bcf28c (diff)
Cleanup: clang-format
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/armature.c1
-rw-r--r--source/blender/blenkernel/intern/cloth.c12
-rw-r--r--source/blender/draw/intern/smaa_textures.h12
3 files changed, 16 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 4ecb4093692..c588ee80c78 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1575,7 +1575,6 @@ static void armature_vert_task(void *__restrict userdata,
}
pchan_bone_deform(pchan, weight, vec, dq, smat, co, &contrib);
-
}
}
/* if there are vertexgroups but not groups with bones
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index d26dca4a252..d80fae29cc8 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -901,9 +901,9 @@ static void cloth_from_mesh(ClothModifierData *clmd, Mesh *mesh)
}
}
-/***************************************************************************************
- * SPRING NETWORK GPU_BATCH_BUILDING IMPLEMENTATION BEGIN
- ***************************************************************************************/
+/* -------------------------------------------------------------------- */
+/** \name Spring Network Building Implementation
+ * \{ */
BLI_INLINE void spring_verts_ordered_set(ClothSpring *spring, int v0, int v1)
{
@@ -1744,8 +1744,6 @@ static int cloth_build_springs(ClothModifierData *clmd, Mesh *mesh)
#endif
return 1;
+}
-} /* cloth_build_springs */
- /***************************************************************************************
- * SPRING NETWORK GPU_BATCH_BUILDING IMPLEMENTATION END
- ***************************************************************************************/
+/** \} */
diff --git a/source/blender/draw/intern/smaa_textures.h b/source/blender/draw/intern/smaa_textures.h
index 0e1d1cb3489..74b8260fbe6 100644
--- a/source/blender/draw/intern/smaa_textures.h
+++ b/source/blender/draw/intern/smaa_textures.h
@@ -34,6 +34,9 @@
#define AREATEX_PITCH (AREATEX_WIDTH * 2)
#define AREATEX_SIZE (AREATEX_HEIGHT * AREATEX_PITCH)
+/* Don't re-wrap large data definitions. */
+/* clang-format off */
+
/**
* Stored in R8G8 format. Load it in the following format:
* - DX10: DXGI_FORMAT_R8G8_UNORM
@@ -14975,11 +14978,16 @@ static const unsigned char areaTexBytes[] = {
0x00, 0x00, 0x00, 0x00
};
+/* clang-format on */
+
#define SEARCHTEX_WIDTH 64
#define SEARCHTEX_HEIGHT 16
#define SEARCHTEX_PITCH SEARCHTEX_WIDTH
#define SEARCHTEX_SIZE (SEARCHTEX_HEIGHT * SEARCHTEX_PITCH)
+/* Don't re-wrap large data definitions. */
+/* clang-format off */
+
/**
* Stored in R8 format. Load it in the following format:
* - DX10: DXGI_FORMAT_R8_UNORM
@@ -15073,4 +15081,6 @@ static const unsigned char searchTexBytes[] = {
0x00, 0x00, 0x00, 0x00,
};
-#endif /* __SMAA_TEXTURES_H__ */ \ No newline at end of file
+/* clang-format off */
+
+#endif /* __SMAA_TEXTURES_H__ */