[Bf-blender-cvs] [0acc1b4c6c4] master: Cleanup: style

[Campbell Barton]

Commit: 0acc1b4c6c42a4f3b056b805bdc3c25f0666954d
Author: Campbell Barton
Date:   Thu Sep 20 10:06:59 2018 +1000
Branches: master
https://developer.blender.org/rB0acc1b4c6c42a4f3b056b805bdc3c25f0666954d

Cleanup: style

===================================================================

M	source/blender/alembic/intern/abc_points.cc
M	source/blender/blenkernel/intern/modifiers_bmesh.c
M	source/blender/blenkernel/intern/tracking_stabilize.c
M	source/blender/blenkernel/intern/tracking_util.c
M	source/blender/compositor/nodes/COM_RenderLayersNode.cpp

===================================================================

diff --git a/source/blender/alembic/intern/abc_points.cc b/source/blender/alembic/intern/abc_points.cc
index 80567cd6bf0..738adb4cd3a 100644
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@ -60,10 +60,10 @@ using Alembic::AbcGeom::OPointsSchema;
 
 AbcPointsWriter::AbcPointsWriter(Scene *scene,
                                  Object *ob,
-	                             AbcTransformWriter *parent,
-	                             uint32_t time_sampling,
-	                             ExportSettings &settings,
-	                             ParticleSystem *psys)
+                                 AbcTransformWriter *parent,
+                                 uint32_t time_sampling,
+                                 ExportSettings &settings,
+                                 ParticleSystem *psys)
     : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
 {
 	m_psys = psys;
diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c
index a1172d3f110..4de876f1060 100644
--- a/source/blender/blenkernel/intern/modifiers_bmesh.c
+++ b/source/blender/blenkernel/intern/modifiers_bmesh.c
@@ -106,7 +106,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm, const bool calc_face_normal)
 
 	/*do verts*/
 	bool vert_allocated;
-	mv = mvert = DM_get_vert_array(dm, &vert_allocated);;
+	mv = mvert = DM_get_vert_array(dm, &vert_allocated);
 	for (i = 0; i < totvert; i++, mv++) {
 		v = BM_vert_create(bm, mv->co, NULL, BM_CREATE_SKIP_CD);
 		normal_short_to_float_v3(v->no, mv->no);
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c
index cbf1a02a46c..331db5b6ff0 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.c
+++ b/source/blender/blenkernel/intern/tracking_stabilize.c
@@ -992,7 +992,7 @@ static void initialize_all_tracks(StabContext *ctx, float aspect)
 	 * By definition, offset contribution is zero there.
 	 */
 	int reference_frame = tracking->stabilization.anchor_frame;
-	float average_angle=0, average_scale_step=0;
+	float average_angle = 0, average_scale_step = 0;
 	float average_translation[2], average_pos[2], pivot[2];
 	zero_v2(average_translation);
 	zero_v2(pivot);
diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c
index 8c1b846db84..621e0cc6a2e 100644
--- a/source/blender/blenkernel/intern/tracking_util.c
+++ b/source/blender/blenkernel/intern/tracking_util.c
@@ -853,17 +853,17 @@ static ImBuf *accessor_get_ibuf(TrackingImageAccessor *accessor,
 }
 
 static libmv_CacheKey accessor_get_image_callback(
-		struct libmv_FrameAccessorUserData *user_data,
-		int clip_index,
-		int frame,
-		libmv_InputMode input_mode,
-		int downscale,
-		const libmv_Region *region,
-		const libmv_FrameTransform *transform,
-		float **destination,
-		int *width,
-		int *height,
-		int *channels)
+        struct libmv_FrameAccessorUserData *user_data,
+        int clip_index,
+        int frame,
+        libmv_InputMode input_mode,
+        int downscale,
+        const libmv_Region *region,
+        const libmv_FrameTransform *transform,
+        float **destination,
+        int *width,
+        int *height,
+        int *channels)
 {
 	TrackingImageAccessor *accessor = (TrackingImageAccessor *) user_data;
 	ImBuf *ibuf;
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
index 2286db81860..6c0e7099150 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
@@ -78,8 +78,8 @@ void RenderLayersNode::testRenderLink(NodeConverter &converter,
 	const int num_outputs = this->getNumberOfOutputSockets();
 	for (int i = 0; i < num_outputs; i++) {
 		NodeOutput *output = this->getOutputSocket(i);
-		NodeImageLayer *storage = (NodeImageLayer*) output->getbNodeSocket()->storage;
-		RenderPass *rpass = (RenderPass*) BLI_findstring(
+		NodeImageLayer *storage = (NodeImageLayer *)output->getbNodeSocket()->storage;
+		RenderPass *rpass = (RenderPass *)BLI_findstring(
 		        &rl->passes,
 		        storage->pass_name,
 		        offsetof(RenderPass, name));