correct indentation and some whitespace edits (no functional changes)

16 files changed, 50 insertions, 51 deletions

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 09021e71025..5303baddbca 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -333,7 +333,7 @@ void brush_reset_sculpt(Brush *br)
 	/* enable this to see any non-default
 	   settings used by a brush:
 
-	   brush_debug_print_state(br);
+	brush_debug_print_state(br);
 	*/
 
 	brush_set_defaults(br);
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 6fb3922122e..1e38f666da7 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -231,7 +231,7 @@ static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
 		cddm->pbvh = BLI_pbvh_new();
 		cddm->pbvh_draw = can_pbvh_draw(ob, dm);
 		BLI_pbvh_build_mesh(cddm->pbvh, me->mface, me->mvert,
-				   me->totface, me->totvert);
+		                    me->totface, me->totvert);
 
 		if(ss->modifiers_active && ob->derivedDeform) {
 			DerivedMesh *deformdm= ob->derivedDeform;
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 57a9dbcbc0f..4d5dce14b27 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -60,9 +60,9 @@ double tval( void )
 }
 #else
 #include <sys/time.h>
-			 static struct timeval _tstart, _tend;
-	 static struct timezone tz;
-	 void tstart ( void )
+static struct timeval _tstart, _tend;
+static struct timezone tz;
+void tstart ( void )
 {
 	gettimeofday ( &_tstart, &tz );
 }
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 160f5703a01..8a6e8faf29a 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -67,8 +67,8 @@
 
 /* local */
 static int cu_isectLL(float *v1, float *v2, float *v3, float *v4, 
-			   short cox, short coy, 
-			   float *labda, float *mu, float *vec);
+                      short cox, short coy,
+                      float *labda, float *mu, float *vec);
 
 void unlink_curve(Curve *cu)
 {
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index c6b4cab6215..d7cc5376e21 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -90,7 +90,7 @@ typedef struct LayerTypeInfo {
 	 * count gives the number of elements in sources
 	 */
 	void (*interp)(void **sources, float *weights, float *sub_weights,
-				   int count, void *dest);
+	               int count, void *dest);
 
 	/* a function to swap the data in corners of the element */
 	void (*swap)(void *data, const int *corner_indices);
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 7f099c03d09..b1e39b1d768 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1148,8 +1148,8 @@ void graph_bfs(void)
 			set_node_xy(node, node->BFS_dist*DEPSX*2, pos[node->BFS_dist]*DEPSY*2);
 			node->color = DAG_BLACK;
 			/*
-			 fprintf(stderr,"BFS node : %20s %i %5.0f %5.0f\n",((ID *) node->ob)->name,node->BFS_dist, node->x, node->y);	
-			 */
+			fprintf(stderr,"BFS node : %20s %i %5.0f %5.0f\n",((ID *) node->ob)->name,node->BFS_dist, node->x, node->y);
+			*/
 		}
 	}
 	queue_delete(nqueue);
@@ -1208,8 +1208,8 @@ int pre_and_post_source_BFS(DagForest *dag, short mask, DagNode *source, graph_a
 			post_func(node->ob,data);
 			node->color = DAG_BLACK;
 			/*
-			 fprintf(stderr,"BFS node : %20s %i %5.0f %5.0f\n",((ID *) node->ob)->name,node->BFS_dist, node->x, node->y);	
-			 */
+			fprintf(stderr,"BFS node : %20s %i %5.0f %5.0f\n",((ID *) node->ob)->name,node->BFS_dist, node->x, node->y);
+			*/
 		}
 	}
 	queue_delete(nqueue);
@@ -1325,7 +1325,7 @@ DagNodeQueue * graph_dfs(void)
 				set_node_xy(node, node->DFS_dist*DEPSX*2, pos[node->DFS_dist]*DEPSY*2);
 				
 				/*
-				 fprintf(stderr,"DFS node : %20s %i %i %i %i\n",((ID *) node->ob)->name,node->BFS_dist, node->DFS_dist, node->DFS_dvtm, node->DFS_fntm ); 	
+				fprintf(stderr,"DFS node : %20s %i %i %i %i\n",((ID *) node->ob)->name,node->BFS_dist, node->DFS_dist, node->DFS_dvtm, node->DFS_fntm );
 				*/
 				push_stack(retqueue,node);
 				
@@ -1574,7 +1574,7 @@ int	is_acyclic( DagForest	*dag) {
 
 void set_node_xy(DagNode *node, float x, float y)
 {
-	 node->x = x;
+	node->x = x;
 	node->y = y;
 }
 
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index 313143f362b..df3694e0bf1 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -79,9 +79,9 @@ double itval(void)
 // #include <pmmintrin.h>
 // #include <pthread.h>
 
-			 static struct timeval _itstart, _itend;
-	 static struct timezone itz;
-	 void itstart(void)
+static struct timeval _itstart, _itend;
+static struct timezone itz;
+void itstart(void)
 {
 	gettimeofday(&_itstart, &itz);
 }
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 650f85da5b3..7332b89f629 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -671,10 +671,10 @@ static ID *alloc_libblock_notest(short type)
 			break;
 		case ID_PA:
 			id = MEM_callocN(sizeof(ParticleSettings), "ParticleSettings");
-			  break;
+			break;
 		case ID_WM:
 			id = MEM_callocN(sizeof(wmWindowManager), "Window manager");
-			  break;
+			break;
 		case ID_GD:
 			id = MEM_callocN(sizeof(bGPdata), "Grease Pencil");
 			break;
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 5c82acde99b..d8628e526ef 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -776,7 +776,7 @@ void *new_pgn_element(int size)
 	if(cur) {
 		if(size+offs < blocksize) {
 			adr= (void *) (cur->data+offs);
-			 offs+= size;
+			offs+= size;
 			return adr;
 		}
 	}
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 6579d7a01f4..ae0774eb34f 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -1147,10 +1147,10 @@ static MultiresFace *find_old_face(ListBase *map, MultiresFace *faces, int v1, i
 	IndexNode *n1;
 	int v[4], i, j;
 
-	 v[0]= v1;
-	 v[1]= v2;
-	 v[2]= v3;
-	 v[3]= v4;
+	v[0]= v1;
+	v[1]= v2;
+	v[2]= v3;
+	v[3]= v4;
 
 	for(n1 = map[v1].first; n1; n1 = n1->next) {
 		int fnd[4] = {0, 0, 0, 0};
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index fa023d8fb43..c4edddf587c 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -961,8 +961,8 @@ void ntreeSetOutput(bNodeTree *ntree)
 			
 			/* we need a check for which output node should be tagged like this, below an exception */
 			if(node->type==CMP_NODE_OUTPUT_FILE)
-			   continue;
-			   
+				continue;
+
 			/* there is more types having output class, each one is checked */
 			for(tnode= ntree->nodes.first; tnode; tnode= tnode->next) {
 				if(tnode->typeinfo->nclass==NODE_CLASS_OUTPUT) {
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index a9aeb37e478..dbfda18942a 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1127,7 +1127,7 @@ static PTCacheFile *ptcache_file_open(PTCacheID *pid, int mode, int cfra)
 		if (!BLI_exists(filename)) {
 			return NULL;
 		}
-		 fp = fopen(filename, "rb");
+		fp = fopen(filename, "rb");
 	} else if (mode==PTCACHE_FILE_WRITE) {
 		BLI_make_existing_file(filename); /* will create the dir if needs be, same as //textures is created */
 		fp = fopen(filename, "wb");
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 3699cf40aa8..e8e9c754806 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -2144,7 +2144,7 @@ static struct ImBuf * do_transform_effect(
 	struct ImBuf * out = prepare_effect_imbufs(context,ibuf1, ibuf2, ibuf3);
 
 	do_transform(context.scene, seq, facf0, 
-		     context.rectx, context.recty, ibuf1, out);
+	             context.rectx, context.recty, ibuf1, out);
 
 	return out;
 }
@@ -2541,7 +2541,7 @@ static void RVIsolateHighlights_byte (unsigned char* in, unsigned char* out,
 
 	for(y=0;y< height;y++) {
 		for (x=0;x< width;x++) {
-			 index= (x+y*width)*4;
+			index= (x+y*width)*4;
 
 			/*	Isolate the intensity */
 			intensity=(in[index+GlowR]+in[index+GlowG]+in[index+GlowB]-threshold);
@@ -2570,7 +2570,7 @@ static void RVIsolateHighlights_float (float* in, float* out,
 
 	for(y=0;y< height;y++) {
 		for (x=0;x< width;x++) {
-			 index= (x+y*width)*4;
+			index= (x+y*width)*4;
 
 			/*	Isolate the intensity */
 			intensity=(in[index+GlowR]+in[index+GlowG]+in[index+GlowB]-threshold);
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 3e9b570d104..53878176fec 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1160,13 +1160,13 @@ static void seq_open_anim_file(Sequence * seq)
 		return;
 	}
 
-	BLI_join_dirfile(name, sizeof(name), 
-			 seq->strip->dir, seq->strip->stripdata->name);
+	BLI_join_dirfile(name, sizeof(name),
+	                 seq->strip->dir, seq->strip->stripdata->name);
 	BLI_path_abs(name, G.main->name);
 	
 	seq->anim = openanim(name, IB_rect |
-			     ((seq->flag & SEQ_FILTERY) ? 
-			      IB_animdeinterlace : 0), seq->streamindex);
+	                     ((seq->flag & SEQ_FILTERY) ?
+	                          IB_animdeinterlace : 0), seq->streamindex);
 
 	if (seq->anim == NULL) {
 		return;
@@ -1211,8 +1211,8 @@ static int seq_proxy_get_fname(SeqRenderData context, Sequence * seq, int cfra,
 	}
 
 	if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE) {
-		BLI_join_dirfile(name, PROXY_MAXFILE, 
-				 dir, seq->strip->proxy->file);
+		BLI_join_dirfile(name, PROXY_MAXFILE,
+		                 dir, seq->strip->proxy->file);
 		BLI_path_abs(name, G.main->name);
 
 		return TRUE;
@@ -1227,14 +1227,13 @@ static int seq_proxy_get_fname(SeqRenderData context, Sequence * seq, int cfra,
 
 	if (seq->type == SEQ_IMAGE) {
 		BLI_snprintf(name, PROXY_MAXFILE, "%s/images/%d/%s_proxy", dir,
-			 context.preview_render_size, 
-			 give_stripelem(seq, cfra)->name);
+		             context.preview_render_size,
+		             give_stripelem(seq, cfra)->name);
 		frameno = 1;
 	} else {
-		frameno = (int) give_stripelem_index(seq, cfra) 
-			+ seq->anim_startofs;
+		frameno = (int) give_stripelem_index(seq, cfra) + seq->anim_startofs;
 		BLI_snprintf(name, PROXY_MAXFILE, "%s/proxy_misc/%d/####", dir, 
-			 context.preview_render_size);
+		             context.preview_render_size);
 	}
 
 	BLI_path_abs(name, G.main->name);
@@ -1504,7 +1503,7 @@ static void color_balance_byte_byte(Sequence * seq, ImBuf* ibuf, float mul)
 
 	for (c = 0; c < 3; c++) {
 		make_cb_table_byte(cb.lift[c], cb.gain[c], cb.gamma[c],
-				   cb_tab[c], mul);
+		                   cb_tab[c], mul);
 	}
 
 	while (p < e) {
@@ -1847,14 +1846,14 @@ static ImBuf* seq_render_effect_strip_impl(
 
 	switch (early_out) {
 	case EARLY_NO_INPUT:
-		out = sh.execute(context, seq, cfra, fac, facf, 
-				 NULL, NULL, NULL);
+		out = sh.execute(context, seq, cfra, fac, facf,
+		                 NULL, NULL, NULL);
 		break;
 	case EARLY_DO_EFFECT:
 		for(i=0; i<3; i++) {
 			if(input[i])
 				ibuf[i] = seq_render_strip(
-					context, input[i], cfra);
+				            context, input[i], cfra);
 		}
 
 		if (ibuf[0] && ibuf[1]) {
@@ -2909,7 +2908,7 @@ int seq_single_check(Sequence *seq)
 	return (seq->len==1 && (
 			seq->type == SEQ_IMAGE 
 			|| ((seq->type & SEQ_EFFECT) && 
-			    get_sequence_effect_num_inputs(seq->type) == 0)));
+	            get_sequence_effect_num_inputs(seq->type) == 0)));
 }
 
 /* check if the selected seq's reference unselected seq's */
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 7f18db63c36..d3d6a658ede 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -561,7 +561,7 @@ static void ccd_build_deflector_hash(Scene *scene, Object *vertexowner, GHash *h
 			}/*--- only with deflecting set */
 
 		}/* mesh && layer*/
-	   base = base->next;
+		base = base->next;
 	} /* while (base) */
 }
 
@@ -589,7 +589,7 @@ static void ccd_update_deflector_hash(Scene *scene, Object *vertexowner, GHash *
 			}/*--- only with deflecting set */
 
 		}/* mesh && layer*/
-	   base = base->next;
+		base = base->next;
 	} /* while (base) */
 }
 
@@ -3356,7 +3356,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob)
 				build_bps_springlist(ob); /* yes we need to do it again*/
 			}
 			springs_from_mesh(ob); /* write the 'rest'-length of the springs */
-			   if (ob->softflag & OB_SB_SELF) {calculate_collision_balls(ob);}
+			if (ob->softflag & OB_SB_SELF) {calculate_collision_balls(ob);}
 
 		}
 
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 2646f5164b2..036a52a1235 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -343,8 +343,8 @@ static AVFrame* generate_video_frame(uint8_t* pixels, ReportList *reports)
 
 	if (c->pix_fmt != PIX_FMT_BGR32) {
 		sws_scale(img_convert_ctx, (const uint8_t * const*) rgb_frame->data,
-			  rgb_frame->linesize, 0, c->height, 
-			  current_frame->data, current_frame->linesize);
+		          rgb_frame->linesize, 0, c->height,
+		          current_frame->data, current_frame->linesize);
 		delete_picture(rgb_frame);
 	}
 	return current_frame;