style cleanup: whitespace/operators

10 files changed, 45 insertions, 53 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index a814ca81beb..e74a412420c 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2666,7 +2666,7 @@ void DM_calc_auto_bump_scale(DerivedMesh *dm)
 
 							if (is_degenerate == 0) {
 								copy_v2_v2(prev_edge, cur_edge);
-								++i;
+								i++;
 							}
 						}
 					}
@@ -2725,7 +2725,7 @@ void DM_calc_auto_bump_scale(DerivedMesh *dm)
 								f2x_surf_area = len_v3(norm);
 								fsurf_ratio = f2x_surf_area/f2x_area_uv;	// tri area divided by texture area
 
-								++nr_accumulated;
+								nr_accumulated++;
 								dsum += (double)(fsurf_ratio);
 							}
 						}
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index e32182ed36e..a335d00c9a0 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1915,8 +1915,7 @@ void CustomData_interp(const CustomData *source, CustomData *dest,
 			void *src_data = source->layers[src_i].data;
 
 			for (j = 0; j < count; ++j)
-				sources[j] = (char *)src_data
-							 + typeInfo->size * src_indices[j];
+				sources[j] = (char *)src_data + typeInfo->size * src_indices[j];
 
 			dest_offset = dest_index * typeInfo->size;
 
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index e212d45742a..2159837c9a0 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -96,8 +96,7 @@ ModifierData *modifier_new(int type)
 	BLI_strncpy(md->name, mti->name, sizeof(md->name));
 
 	md->type = type;
-	md->mode = eModifierMode_Realtime
-	           | eModifierMode_Render | eModifierMode_Expanded;
+	md->mode = eModifierMode_Realtime | eModifierMode_Render | eModifierMode_Expanded;
 
 	if (mti->flags & eModifierTypeFlag_EnableInEditmode)
 		md->mode |= eModifierMode_Editmode;
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 6c3032cb279..bee1f534d05 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -476,9 +476,9 @@ static int get_levels_from_disps(Object *ob)
 				if (md->totdisp == lvl_totdisp)
 					break;
 				else if (md->totdisp < lvl_totdisp)
-					--totlvl;
+					totlvl--;
 				else
-					++totlvl;
+					totlvl++;
 	
 			}
 			
@@ -764,7 +764,7 @@ void multiresModifier_base_apply(MultiresModifierData *mmd, Object *ob)
 				int vndx = me->mloop[p->loopstart + k].v;
 				if (vndx != i) {
 					add_v3_v3(center, origco[vndx]);
-					++tot;
+					tot++;
 				}
 			}
 		}
@@ -1755,7 +1755,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
 	/* Load base verts */
 	for (i = 0; i < lvl1->totvert; ++i) {
 		vvmap[totvert - lvl1->totvert + i] = src;
-		++src;
+		src++;
 	}
 
 	/* Original edges */
@@ -1801,7 +1801,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
 			int sides = lvl1->faces[i].v[3] ? 4 : 3;
 
 			lvl = lvl1->next->next;
-			++dst;
+			dst++;
 
 			for (j = 3; j <= mr->level_count; ++j) {
 				int base = multires_side_tot[totlvl - j + 1] - 2;
@@ -1819,7 +1819,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
 				for (s = 0; s < sides; ++s) {
 					for (x = 0; x < st2; ++x) {
 						vvmap[dst + crossedgelen * (s + 1) - base - x * skip - 1] = lsrc;
-						++lsrc;
+						lsrc++;
 					}
 				}
 
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 950298f3824..cd1561734cc 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -512,9 +512,9 @@ static void distribute_grid(DerivedMesh *dm, ParticleSystem *psys)
 			vec[0]/=delta[0];
 			vec[1]/=delta[1];
 			vec[2]/=delta[2];
-			(pa	+((int)(vec[0]*(size[0]-1))*res
-				+(int)(vec[1]*(size[1]-1)))*res
-				+(int)(vec[2]*(size[2]-1)))->flag &= ~PARS_UNEXIST;
+			(pa	+ ((int)(vec[0] * (size[0] - 1)) * res +
+			       (int)(vec[1] * (size[1] - 1))) * res +
+			        (int)(vec[2] * (size[2] - 1)))->flag &= ~PARS_UNEXIST;
 		}
 	}
 	else if (ELEM(from, PART_FROM_FACE, PART_FROM_VOLUME)) {
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index f3a68d36384..9358b786472 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -312,8 +312,7 @@ static struct ImBuf *do_plugin_effect(
 		if (cp) strncpy(cp, seq->name + 2, sizeof(seq->name) - 2);
 
 		if (seq->plugin->current_private_data) {
-			*seq->plugin->current_private_data 
-			    = seq->plugin->instance_private_data;
+			*seq->plugin->current_private_data = seq->plugin->instance_private_data;
 		}
 
 		float_rendering = (out->rect_float != NULL);
@@ -1094,8 +1093,7 @@ static void do_gammacross_effect_float(float facf0, float UNUSED(facf1),
 		while (x--) {
 
 			*rt = gammaCorrect(
-			    fac1 * invGammaCorrect(*rt1)
-			    + fac2 * invGammaCorrect(*rt2));
+			    fac1 * invGammaCorrect(*rt1) + fac2 * invGammaCorrect(*rt2));
 			rt1++; rt2++; rt++;
 		}
 
@@ -1106,8 +1104,7 @@ static void do_gammacross_effect_float(float facf0, float UNUSED(facf1),
 		while (x--) {
 
 			*rt = gammaCorrect(
-			    fac1 * invGammaCorrect(*rt1)
-			    + fac2 * invGammaCorrect(*rt2));
+			    fac1 * invGammaCorrect(*rt1) + fac2 * invGammaCorrect(*rt2));
 
 			rt1++; rt2++; rt++;
 		}
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 6e043c74816..f36c123e227 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3934,8 +3934,7 @@ static Sequence *seq_dupli(struct Scene *scene, struct Scene *scene_to, Sequence
 	}
 
 	if (seq->strip->color_balance) {
-		seqn->strip->color_balance
-		    = MEM_dupallocN(seq->strip->color_balance);
+		seqn->strip->color_balance = MEM_dupallocN(seq->strip->color_balance);
 	}
 
 	if (seq->type == SEQ_META) {
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 690b6c83870..ee70d4228de 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3514,11 +3514,11 @@ static void lattice_to_softbody(Scene *scene, Object *ob)
 	totvert= lt->pntsu*lt->pntsv*lt->pntsw;
 
 	if (ob->softflag & OB_SB_EDGES) {
-		totspring = ((lt->pntsu -1) * lt->pntsv
-				  + (lt->pntsv -1) * lt->pntsu) * lt->pntsw
-				  +lt->pntsu*lt->pntsv*(lt->pntsw -1);
+		totspring = ((lt->pntsu - 1) * lt->pntsv +
+		             (lt->pntsv - 1) * lt->pntsu) * lt->pntsw +
+		            lt->pntsu*lt->pntsv * (lt->pntsw - 1);
 		if (ob->softflag & OB_SB_QUADS) {
-			totspring += 4*(lt->pntsu -1) *  (lt->pntsv -1)  * (lt->pntsw-1);
+			totspring += 4 * (lt->pntsu - 1) *  (lt->pntsv -1)  * (lt->pntsw - 1);
 		}
 	}
 
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 857a0c86349..e81cab6b912 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -730,8 +730,9 @@ static void ccgDM_getFinalVert(DerivedMesh *dm, int vertNum, MVert *mv)
 		int gridInternalEnd;
 
 		i = 0;
-		while (i < lastface && vertNum >= ccgdm->faceMap[i + 1].startVert)
-			++i;
+		while (i < lastface && vertNum >= ccgdm->faceMap[i + 1].startVert) {
+			i++;
+		}
 
 		f = ccgdm->faceMap[i].face;
 		numVerts = ccgSubSurf_getFaceNumVerts(f);
@@ -774,8 +775,9 @@ static void ccgDM_getFinalVert(DerivedMesh *dm, int vertNum, MVert *mv)
 		int x;
 
 		i = 0;
-		while (i < lastedge && vertNum >= ccgdm->edgeMap[i + 1].startVert)
-			++i;
+		while (i < lastedge && vertNum >= ccgdm->edgeMap[i + 1].startVert) {
+			i++;
+		}
 
 		e = ccgdm->edgeMap[i].edge;
 
@@ -869,8 +871,9 @@ static void ccgDM_getFinalEdge(DerivedMesh *dm, int edgeNum, MEdge *med)
 #endif
 
 		i = 0;
-		while (i < lastface && edgeNum >= ccgdm->faceMap[i + 1].startEdge)
-			++i;
+		while (i < lastface && edgeNum >= ccgdm->faceMap[i + 1].startEdge) {
+			i++;
+		}
 
 		f = ccgdm->faceMap[i].face;
 		/* numVerts = ccgSubSurf_getFaceNumVerts(f); */ /*UNUSED*/
@@ -1144,8 +1147,7 @@ static void ccgDM_copyFinalEdgeArray(DerivedMesh *dm, MEdge *medge)
 
 		if (edgeFlags) {
 			if (edgeIdx != -1) {
-				flags |= (edgeFlags[index] & (ME_SEAM | ME_SHARP))
-				         | ME_EDGEDRAW | ME_EDGERENDER;
+				flags |= ((edgeFlags[index] & (ME_SEAM | ME_SHARP)) | ME_EDGEDRAW | ME_EDGERENDER);
 			}
 		}
 		else {
@@ -3169,10 +3171,10 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 		                    numVerts, vertNum);
 		if (vertOrigIndex) {
 			*vertOrigIndex = ORIGINDEX_NONE;
-			++vertOrigIndex;
+			vertOrigIndex++;
 		}
 
-		++vertNum;
+		vertNum++;
 
 		/*interpolate per-vert data*/
 		for (s = 0; s < numVerts; s++) {
@@ -3183,10 +3185,10 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 
 				if (vertOrigIndex) {
 					*vertOrigIndex = ORIGINDEX_NONE;
-					++vertOrigIndex;
+					vertOrigIndex++;
 				}
 
-				++vertNum;
+				vertNum++;
 			}
 		}
 
@@ -3200,10 +3202,10 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 
 					if (vertOrigIndex) {
 						*vertOrigIndex = ORIGINDEX_NONE;
-						++vertOrigIndex;
+						vertOrigIndex++;
 					}
 
-					++vertNum;
+					vertNum++;
 				}
 			}
 		}
@@ -3299,9 +3301,9 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 			DM_interp_vert_data(dm, &ccgdm->dm, vertIdx, w, 2, vertNum);
 			if (vertOrigIndex) {
 				*vertOrigIndex = ORIGINDEX_NONE;
-				++vertOrigIndex;
+				vertOrigIndex++;
 			}
-			++vertNum;
+			vertNum++;
 		}
 
 		for (i = 0; i < numFinalEdges; ++i) {
@@ -3339,9 +3341,9 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 
 		if (vertOrigIndex) {
 			*vertOrigIndex = mapIndex;
-			++vertOrigIndex;
+			vertOrigIndex++;
 		}
-		++vertNum;
+		vertNum++;
 	}
 
 	ccgdm->dm.numVertData = vertNum;
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 61f26ede9ea..a29de3b0157 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -317,8 +317,7 @@ static AVFrame* generate_video_frame(uint8_t* pixels, ReportList *reports)
 	if (ENDIAN_ORDER == L_ENDIAN) {
 		int y;
 		for (y = 0; y < height; y++) {
-			uint8_t* target = rgb_frame->data[0]
-				+ width * 4 * (height - y - 1);
+			uint8_t* target = rgb_frame->data[0] + width * 4 * (height - y - 1);
 			uint8_t* src = rendered_frame + width * 4 * y;
 			uint8_t* end = src + width * 4;
 			while (src != end) {
@@ -335,8 +334,7 @@ static AVFrame* generate_video_frame(uint8_t* pixels, ReportList *reports)
 	else {
 		int y;
 		for (y = 0; y < height; y++) {
-			uint8_t* target = rgb_frame->data[0]
-				+ width * 4 * (height - y - 1);
+			uint8_t* target = rgb_frame->data[0] + width * 4 * (height - y - 1);
 			uint8_t* src = rendered_frame + width * 4 * y;
 			uint8_t* end = src + width * 4;
 			while (src != end) {
@@ -488,8 +486,7 @@ static AVStream* alloc_video_stream(RenderData *rd, int codec_id, AVFormatContex
 	c->rc_max_rate = rd->ffcodecdata.rc_max_rate*1000;
 	c->rc_min_rate = rd->ffcodecdata.rc_min_rate*1000;
 	c->rc_buffer_size = rd->ffcodecdata.rc_buffer_size * 1024;
-	c->rc_initial_buffer_occupancy 
-		= rd->ffcodecdata.rc_buffer_size*3/4;
+	c->rc_initial_buffer_occupancy = rd->ffcodecdata.rc_buffer_size * 3 / 4;
 	c->rc_buffer_aggressivity = 1.0;
 	c->me_method = ME_EPZS;
 	
@@ -1110,8 +1107,7 @@ IDProperty *BKE_ffmpeg_property_add(RenderData *rd, const char *type, int opt_in
 	parent = c.av_class->option + parent_index;
 
 	if (!rd->ffcodecdata.properties) {
-		rd->ffcodecdata.properties 
-			= IDP_New(IDP_GROUP, &val, "ffmpeg"); 
+		rd->ffcodecdata.properties = IDP_New(IDP_GROUP, &val, "ffmpeg"); 
 	}
 
 	group = IDP_GetPropertyFromGroup(rd->ffcodecdata.properties, type);