Cleanup: warnings & style

4 files changed, 8 insertions, 7 deletions

diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index dfa6c6fb103..abba61310a4 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -399,7 +399,7 @@ static BVHTree *bvhtree_from_mesh_verts_create_tree(
 			for (i = 0; i < numVerts; i++) {
 				if (BLI_BITMAP_TEST_BOOL(mask, i)) {
 					if (em != NULL) {
-						if (index_array){
+						if (index_array) {
 							index = index_array[i];
 							if (index == ORIGINDEX_NONE) {
 								continue;
@@ -432,7 +432,7 @@ static BVHTree *bvhtree_from_mesh_verts_create_tree(
 					continue;
 				}
 				if (em != NULL) {
-					if (index_array){
+					if (index_array) {
 						index = index_array[i];
 						if (index == ORIGINDEX_NONE) {
 							continue;
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index ca3eda7ad7a..e3b9b21f341 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -188,7 +188,7 @@ static void mesh_calc_normals_poly_accum_task_cb(void *userdata, const int pidx)
 	MeshCalcNormalsData *data = userdata;
 	const MPoly *mp = &data->mpolys[pidx];
 	const MLoop *ml = &data->mloop[mp->loopstart];
-    const MVert *mverts = data->mverts;
+	const MVert *mverts = data->mverts;
 
 	float pnor_temp[3];
 	float *pnor = data->pnors ? data->pnors[pidx] : pnor_temp;
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index a13daf24775..00c22e17230 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1015,7 +1015,8 @@ static void pbvh_update_normals_store_task_cb(void *userdata, const int n)
 			MVert *mvert = &bvh->verts[v];
 
 			/* mvert is shared between nodes, hence between threads. */
-			if (atomic_fetch_and_and_uint8((uint8_t *)&mvert->flag, (uint8_t)~ME_VERT_PBVH_UPDATE) & ME_VERT_PBVH_UPDATE)
+			if (atomic_fetch_and_and_uint8(
+			        (uint8_t *)&mvert->flag, (uint8_t)~ME_VERT_PBVH_UPDATE) & ME_VERT_PBVH_UPDATE)
 			{
 				normalize_v3(vnors[v]);
 				normal_float_to_short_v3(mvert->no, vnors[v]);
@@ -1056,7 +1057,7 @@ static void pbvh_update_normals(PBVH *bvh, PBVHNode **nodes,
 
 	PBVHUpdateData data = {
 	    .bvh = bvh, .nodes = nodes,
-		.fnors = fnors, .vnors = vnors,
+	    .fnors = fnors, .vnors = vnors,
 	};
 
 	BLI_task_parallel_range(0, totnode, &data, pbvh_update_normals_accum_task_cb, totnode > PBVH_THREADED_LIMIT);
@@ -1090,7 +1091,7 @@ void pbvh_update_BB_redraw(PBVH *bvh, PBVHNode **nodes, int totnode, int flag)
 	/* update BB, redraw flag */
 	PBVHUpdateData data = {
 	    .bvh = bvh, .nodes = nodes,
-		.flag = flag,
+	    .flag = flag,
 	};
 
 	BLI_task_parallel_range(0, totnode, &data, pbvh_update_BB_redraw_task_cb, totnode > PBVH_THREADED_LIMIT);
diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c
index 078aaf18014..3c2444b0ef1 100644
--- a/source/blender/blenkernel/intern/tracking_util.c
+++ b/source/blender/blenkernel/intern/tracking_util.c
@@ -486,7 +486,7 @@ MovieTrackingMarker *tracking_get_keyframed_marker(MovieTrackingTrack *track,
 				/* Could happen when trying to get reference marker for the fist
 				 * one on the segment which isn't surrounded by disabled markers.
 				 *
-				 * There's no really good choise here, just use the reference
+				 * There's no really good choice here, just use the reference
 				 * marker which looks correct..
 				 */
 				if (marker_keyed_fallback == NULL) {