style cleanup

13 files changed, 131 insertions, 128 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 352e9d57489..f2936884126 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7508,7 +7508,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			for (md = ob->modifiers.first; md; md = md->next) {
 				if (md->type == eModifierType_Smoke) {
 					SmokeModifierData *smd = (SmokeModifierData *)md;
-					if((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
+					if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
 						int maxres = MAX3(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2]);
 						smd->domain->scale = smd->domain->dx * maxres;
 						smd->domain->dx = 1.0f / smd->domain->scale;
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 2543b49a48d..b3b4e47ba81 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -927,11 +927,11 @@ static void UNUSED_FUNCTION(seq_remap_paths) (Scene * scene)
 		return;
 	
 	BLI_strncpy(from, last_seq->strip->dir, sizeof(from));
-// XXX	if (0==sbutton(from, 0, sizeof(from)-1, "From: "))
+// XXX	if (0 == sbutton(from, 0, sizeof(from)-1, "From: "))
 //		return;
 	
 	BLI_strncpy(to, from, sizeof(to));
-// XXX	if (0==sbutton(to, 0, sizeof(to)-1, "To: "))
+// XXX	if (0 == sbutton(to, 0, sizeof(to)-1, "To: "))
 //		return;
 	
 	if (strcmp(to, from) == 0)
@@ -1989,7 +1989,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op))
 	Scene *scene = CTX_data_scene(C);
 	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
 
-	Sequence *seq, *last_seq = BKE_sequencer_active_get(scene); /* last_seq checks ed==NULL */
+	Sequence *seq, *last_seq = BKE_sequencer_active_get(scene); /* last_seq checks (ed == NULL) */
 
 	if (last_seq == NULL || last_seq->type != SEQ_META)
 		return OPERATOR_CANCELLED;
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c
index 85eda858d24..501e1cad67e 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -128,7 +128,7 @@ static void text_listener(ScrArea *sa, wmNotifier *wmn)
 	switch (wmn->category) {
 		case NC_TEXT:
 			/* check if active text was changed, no need to redraw if text isn't active
-			 * reference==NULL means text was unlinked, should update anyway for this
+			 * (reference == NULL) means text was unlinked, should update anyway for this
 			 * case -- no way to know was text active before unlinking or not */
 			if (wmn->reference && wmn->reference != st->text)
 				break;
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 6a070070379..0de7e2569c0 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -1696,7 +1696,7 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
 				bone = pchan->bone;
 				if (bone) {
 					/* 1) bone must be visible, 2) for OpenGL select-drawing cannot have unselectable [#27194] 
-					 * NOTE: this is the only case with NO_DEFORM==0 flag, as this is for envelope influence drawing 
+					 * NOTE: this is the only case with (NO_DEFORM == 0) flag, as this is for envelope influence drawing
 					 */
 					if ( (bone->flag & (BONE_HIDDEN_P | BONE_NO_DEFORM | BONE_HIDDEN_PG)) == 0 &&
 					     ((G.f & G_PICKSEL) == 0 || (bone->flag & BONE_UNSELECTABLE) == 0) )
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 56949fbe40c..aec7913e80d 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3949,7 +3949,7 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 	int retval = 0;
 
 	/* backface culling */
-	if(v3d->flag2 & V3D_BACKFACE_CULLING) {
+	if (v3d->flag2 & V3D_BACKFACE_CULLING) {
 		/* not all displists use same in/out normal direction convention */
 		glEnable(GL_CULL_FACE);
 		glCullFace((ob->type == OB_MBALL) ? GL_BACK : GL_FRONT);
@@ -6592,7 +6592,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	if (v3d->zbuf == 0 && dt > OB_WIRE) dt = OB_WIRE;
 	dtx = 0;
 
-	/* faceselect exception: also draw solid when dt==wire, except in editmode */
+	/* faceselect exception: also draw solid when (dt == wire), except in editmode */
 	if (is_obact && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) {
 		if (ob->type == OB_MESH) {
 
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index f2e585c8f79..f7014bb51eb 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1863,7 +1863,7 @@ static void draw_dupli_objects_color(Scene *scene, ARegion *ar, View3D *v3d, Bas
 		/* generate displist */
 		if (use_displist == -1) {
 
-			/* note, since this was added, its checked dob->type==OB_DUPLIGROUP
+			/* note, since this was added, its checked (dob->type == OB_DUPLIGROUP)
 			 * however this is very slow, it was probably needed for the NLA
 			 * offset feature (used in group-duplicate.blend but no longer works in 2.5)
 			 * so for now it should be ok to - campbell */
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c
index 06cae3585cd..95cc37d9f87 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -547,7 +547,7 @@ static void flyEvent(FlyInfo *fly, wmEvent *event)
 				time_currwheel = PIL_check_seconds_timer();
 				time_wheel = (float)(time_currwheel - fly->time_lastwheel);
 				fly->time_lastwheel = time_currwheel;
-				/* Mouse wheel delays range from 0.5==slow to 0.01==fast */
+				/* Mouse wheel delays range from (0.5 == slow) to (0.01 == fast) */
 				time_wheel = 1.0f + (10.0f - (20.0f * MIN2(time_wheel, 0.5f))); /* 0-0.5 -> 0-5.0 */
 
 				if (fly->speed < 0.0f) {
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index c2d58349075..18c7e975356 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -500,7 +500,7 @@ static void do_lasso_select_curve__doSelect(void *userData, Nurb *UNUSED(nu), BP
 		}
 		else {
 			if (cu->drawflag & CU_HIDE_HANDLES) {
-				/* can only be beztindex==0 here since handles are hidden */
+				/* can only be (beztindex == 0) here since handles are hidden */
 				bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
 			}
 			else {
@@ -1480,15 +1480,18 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short dese
 			if (extend) {
 				ED_base_object_select(basact, BA_SELECT);
 			}
-			else if(deselect) {
+			else if (deselect) {
 				ED_base_object_select(basact, BA_DESELECT);
 			}
-			else if(toggle) {
+			else if (toggle) {
 				if (basact->flag & SELECT) {
-					if (basact == oldbasact)
+					if (basact == oldbasact) {
 						ED_base_object_select(basact, BA_DESELECT);
+					}
+				}
+				else {
+					ED_base_object_select(basact, BA_SELECT);
 				}
-				else ED_base_object_select(basact, BA_SELECT);
 			}
 			else {
 				deselectall_except(scene, basact);
@@ -1549,7 +1552,7 @@ static void do_nurbs_box_select__doSelect(void *userData, Nurb *UNUSED(nu), BPoi
 		}
 		else {
 			if (cu->drawflag & CU_HIDE_HANDLES) {
-				/* can only be beztindex==0 here since handles are hidden */
+				/* can only be (beztindex == 0) here since handles are hidden */
 				bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
 			}
 			else {
@@ -2294,7 +2297,7 @@ static void nurbscurve_circle_doSelect(void *userData, Nurb *UNUSED(nu), BPoint
 		}
 		else {
 			if (cu->drawflag & CU_HIDE_HANDLES) {
-				/* can only be beztindex==0 here since handles are hidden */
+				/* can only be (beztindex == 0) here since handles are hidden */
 				bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
 			}
 			else {
diff --git a/source/blender/editors/util/editmode_undo.c b/source/blender/editors/util/editmode_undo.c
index 9aaccb57fe2..18610d57bbd 100644
--- a/source/blender/editors/util/editmode_undo.c
+++ b/source/blender/editors/util/editmode_undo.c
@@ -129,7 +129,7 @@ void undo_editmode_push(bContext *C, const char *name,
 	/* at first here was code to prevent an "original" key to be inserted twice
 	 * this was giving conflicts for example when mesh changed due to keys or apply */
 	
-	/* remove all undos after (also when curundo==NULL) */
+	/* remove all undos after (also when curundo == NULL) */
 	while (undobase.last != curundo) {
 		uel = undobase.last;
 		uel->freedata(uel->undodata);
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index fb277815878..7ae4aa550f9 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -1254,7 +1254,7 @@ int GPU_enable_material(int nr, void *attribs)
 			if (GMS.is_alpha_pass) glDepthMask(1);
 
 			if (GMS.backface_culling) {
-				if(mat->game.flag)
+				if (mat->game.flag)
 					glEnable(GL_CULL_FACE);
 				else
 					glDisable(GL_CULL_FACE);
diff --git a/source/blender/ikplugin/intern/iksolver_plugin.c b/source/blender/ikplugin/intern/iksolver_plugin.c
index c726102247a..b9980b1401d 100644
--- a/source/blender/ikplugin/intern/iksolver_plugin.c
+++ b/source/blender/ikplugin/intern/iksolver_plugin.c
@@ -57,47 +57,47 @@
 /* Note: detecting the IK chain is duplicate code... in drawarmature.c and in transform_conversions.c */
 static void initialize_posetree(struct Object *UNUSED(ob), bPoseChannel *pchan_tip)
 {
-	bPoseChannel *curchan, *pchan_root=NULL, *chanlist[256], **oldchan;
+	bPoseChannel *curchan, *pchan_root = NULL, *chanlist[256], **oldchan;
 	PoseTree *tree;
 	PoseTarget *target;
 	bConstraint *con;
 	bKinematicConstraint *data;
-	int a, t, segcount= 0, size, newsize, *oldparent, parent;
+	int a, t, segcount = 0, size, newsize, *oldparent, parent;
 
 	/* find IK constraint, and validate it */
-	for (con= pchan_tip->constraints.first; con; con= con->next) {
-		if (con->type==CONSTRAINT_TYPE_KINEMATIC) {
-			data=(bKinematicConstraint*)con->data;
+	for (con = pchan_tip->constraints.first; con; con = con->next) {
+		if (con->type == CONSTRAINT_TYPE_KINEMATIC) {
+			data = (bKinematicConstraint *)con->data;
 			if (data->flag & CONSTRAINT_IK_AUTO) break;
-			if (data->tar==NULL) continue;
-			if (data->tar->type==OB_ARMATURE && data->subtarget[0]==0) continue;
-			if ((con->flag & (CONSTRAINT_DISABLE|CONSTRAINT_OFF))==0 && (con->enforce != 0.0f)) break;
+			if (data->tar == NULL) continue;
+			if (data->tar->type == OB_ARMATURE && data->subtarget[0] == 0) continue;
+			if ((con->flag & (CONSTRAINT_DISABLE | CONSTRAINT_OFF)) == 0 && (con->enforce != 0.0f)) break;
 		}
 	}
-	if (con==NULL) return;
+	if (con == NULL) return;
 	
 	/* exclude tip from chain? */
 	if (!(data->flag & CONSTRAINT_IK_TIP))
-		pchan_tip= pchan_tip->parent;
+		pchan_tip = pchan_tip->parent;
 	
 	/* Find the chain's root & count the segments needed */
-	for (curchan = pchan_tip; curchan; curchan=curchan->parent) {
+	for (curchan = pchan_tip; curchan; curchan = curchan->parent) {
 		pchan_root = curchan;
 		
-		curchan->flag |= POSE_CHAIN;	// don't forget to clear this
-		chanlist[segcount]=curchan;
+		curchan->flag |= POSE_CHAIN;    // don't forget to clear this
+		chanlist[segcount] = curchan;
 		segcount++;
 		
-		if (segcount==data->rootbone || segcount>255) break; // 255 is weak
+		if (segcount == data->rootbone || segcount > 255) break;  // 255 is weak
 	}
 	if (!segcount) return;
 
 	/* setup the chain data */
 	
 	/* we make tree-IK, unless all existing targets are in this chain */
-	for (tree= pchan_root->iktree.first; tree; tree= tree->next) {
-		for (target= tree->targets.first; target; target= target->next) {
-			curchan= tree->pchan[target->tip];
+	for (tree = pchan_root->iktree.first; tree; tree = tree->next) {
+		for (target = tree->targets.first; target; target = target->next) {
+			curchan = tree->pchan[target->tip];
 			if (curchan->flag & POSE_CHAIN)
 				curchan->flag &= ~POSE_CHAIN;
 			else
@@ -107,52 +107,52 @@ static void initialize_posetree(struct Object *UNUSED(ob), bPoseChannel *pchan_t
 	}
 
 	/* create a target */
-	target= MEM_callocN(sizeof(PoseTarget), "posetarget");
-	target->con= con;
+	target = MEM_callocN(sizeof(PoseTarget), "posetarget");
+	target->con = con;
 	pchan_tip->flag &= ~POSE_CHAIN;
 
-	if (tree==NULL) {
+	if (tree == NULL) {
 		/* make new tree */
-		tree= MEM_callocN(sizeof(PoseTree), "posetree");
+		tree = MEM_callocN(sizeof(PoseTree), "posetree");
 
-		tree->type= CONSTRAINT_TYPE_KINEMATIC;
+		tree->type = CONSTRAINT_TYPE_KINEMATIC;
 		
-		tree->iterations= data->iterations;
-		tree->totchannel= segcount;
+		tree->iterations = data->iterations;
+		tree->totchannel = segcount;
 		tree->stretch = (data->flag & CONSTRAINT_IK_STRETCH);
 		
-		tree->pchan= MEM_callocN(segcount*sizeof(void*), "ik tree pchan");
-		tree->parent= MEM_callocN(segcount*sizeof(int), "ik tree parent");
-		for (a=0; a<segcount; a++) {
-			tree->pchan[a]= chanlist[segcount-a-1];
-			tree->parent[a]= a-1;
+		tree->pchan = MEM_callocN(segcount * sizeof(void *), "ik tree pchan");
+		tree->parent = MEM_callocN(segcount * sizeof(int), "ik tree parent");
+		for (a = 0; a < segcount; a++) {
+			tree->pchan[a] = chanlist[segcount - a - 1];
+			tree->parent[a] = a - 1;
 		}
-		target->tip= segcount-1;
+		target->tip = segcount - 1;
 		
 		/* AND! link the tree to the root */
 		BLI_addtail(&pchan_root->iktree, tree);
 	}
 	else {
-		tree->iterations= MAX2(data->iterations, tree->iterations);
-		tree->stretch= tree->stretch && !(data->flag & CONSTRAINT_IK_STRETCH);
+		tree->iterations = MAX2(data->iterations, tree->iterations);
+		tree->stretch = tree->stretch && !(data->flag & CONSTRAINT_IK_STRETCH);
 
 		/* skip common pose channels and add remaining*/
-		size= MIN2(segcount, tree->totchannel);
+		size = MIN2(segcount, tree->totchannel);
 		a = t = 0;
-		while (a<size && t<tree->totchannel) {
+		while (a < size && t < tree->totchannel) {
 			// locate first matching channel
-			for (;t<tree->totchannel && tree->pchan[t]!=chanlist[segcount-a-1];t++);
-			if (t>=tree->totchannel)
+			for (; t < tree->totchannel && tree->pchan[t] != chanlist[segcount - a - 1]; t++) ;
+			if (t >= tree->totchannel)
 				break;
-			for (; a<size && t<tree->totchannel && tree->pchan[t]==chanlist[segcount-a-1]; a++, t++);
+			for (; a < size && t < tree->totchannel && tree->pchan[t] == chanlist[segcount - a - 1]; a++, t++) ;
 		}
 
-		segcount= segcount-a;
-		target->tip= tree->totchannel + segcount - 1;
+		segcount = segcount - a;
+		target->tip = tree->totchannel + segcount - 1;
 
 		if (segcount > 0) {
 			for (parent = a - 1; parent < tree->totchannel; parent++)
-				if (tree->pchan[parent] == chanlist[segcount-1]->parent)
+				if (tree->pchan[parent] == chanlist[segcount - 1]->parent)
 					break;
 			
 			/* shouldn't happen, but could with dependency cycles */
@@ -160,25 +160,25 @@ static void initialize_posetree(struct Object *UNUSED(ob), bPoseChannel *pchan_t
 				parent = a - 1;
 
 			/* resize array */
-			newsize= tree->totchannel + segcount;
-			oldchan= tree->pchan;
-			oldparent= tree->parent;
-
-			tree->pchan= MEM_callocN(newsize*sizeof(void*), "ik tree pchan");
-			tree->parent= MEM_callocN(newsize*sizeof(int), "ik tree parent");
-			memcpy(tree->pchan, oldchan, sizeof(void*)*tree->totchannel);
-			memcpy(tree->parent, oldparent, sizeof(int)*tree->totchannel);
+			newsize = tree->totchannel + segcount;
+			oldchan = tree->pchan;
+			oldparent = tree->parent;
+
+			tree->pchan = MEM_callocN(newsize * sizeof(void *), "ik tree pchan");
+			tree->parent = MEM_callocN(newsize * sizeof(int), "ik tree parent");
+			memcpy(tree->pchan, oldchan, sizeof(void *) * tree->totchannel);
+			memcpy(tree->parent, oldparent, sizeof(int) * tree->totchannel);
 			MEM_freeN(oldchan);
 			MEM_freeN(oldparent);
 
 			/* add new pose channels at the end, in reverse order */
-			for (a=0; a<segcount; a++) {
-				tree->pchan[tree->totchannel+a]= chanlist[segcount-a-1];
-				tree->parent[tree->totchannel+a]= tree->totchannel+a-1;
+			for (a = 0; a < segcount; a++) {
+				tree->pchan[tree->totchannel + a] = chanlist[segcount - a - 1];
+				tree->parent[tree->totchannel + a] = tree->totchannel + a - 1;
 			}
-			tree->parent[tree->totchannel]= parent;
+			tree->parent[tree->totchannel] = parent;
 			
-			tree->totchannel= newsize;
+			tree->totchannel = newsize;
 		}
 
 		/* move tree to end of list, for correct evaluation order */
@@ -199,7 +199,7 @@ static void make_dmats(bPoseChannel *pchan)
 	if (pchan->parent) {
 		float iR_parmat[4][4];
 		invert_m4_m4(iR_parmat, pchan->parent->pose_mat);
-		mult_m4_m4m4(pchan->chan_mat, iR_parmat,  pchan->pose_mat);	// delta mat
+		mult_m4_m4m4(pchan->chan_mat, iR_parmat,  pchan->pose_mat); // delta mat
 	}
 	else copy_m4_m4(pchan->chan_mat, pchan->pose_mat);
 }
@@ -241,27 +241,27 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 	float goal[4][4], goalinv[4][4];
 	float irest_basis[3][3], full_basis[3][3];
 	float end_pose[4][4], world_pose[4][4];
-	float length, basis[3][3], rest_basis[3][3], start[3], *ikstretch=NULL;
-	float resultinf=0.0f;
-	int a, flag, hasstretch=0, resultblend=0;
+	float length, basis[3][3], rest_basis[3][3], start[3], *ikstretch = NULL;
+	float resultinf = 0.0f;
+	int a, flag, hasstretch = 0, resultblend = 0;
 	bPoseChannel *pchan;
 	IK_Segment *seg, *parent, **iktree, *iktarget;
 	IK_Solver *solver;
 	PoseTarget *target;
-	bKinematicConstraint *data, *poleangledata=NULL;
+	bKinematicConstraint *data, *poleangledata = NULL;
 	Bone *bone;
 
 	if (tree->totchannel == 0)
 		return;
 	
-	iktree= MEM_mallocN(sizeof(void*)*tree->totchannel, "ik tree");
+	iktree = MEM_mallocN(sizeof(void *) * tree->totchannel, "ik tree");
 
-	for (a=0; a<tree->totchannel; a++) {
-		pchan= tree->pchan[a];
-		bone= pchan->bone;
+	for (a = 0; a < tree->totchannel; a++) {
+		pchan = tree->pchan[a];
+		bone = pchan->bone;
 		
 		/* set DoF flag */
-		flag= 0;
+		flag = 0;
 		if (!(pchan->ikflag & BONE_IK_NO_XDOF) && !(pchan->ikflag & BONE_IK_NO_XDOF_TEMP))
 			flag |= IK_XDOF;
 		if (!(pchan->ikflag & BONE_IK_NO_YDOF) && !(pchan->ikflag & BONE_IK_NO_YDOF_TEMP))
@@ -274,13 +274,13 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 			hasstretch = 1;
 		}
 		
-		seg= iktree[a]= IK_CreateSegment(flag);
+		seg = iktree[a] = IK_CreateSegment(flag);
 		
 		/* find parent */
 		if (a == 0)
-			parent= NULL;
+			parent = NULL;
 		else
-			parent= iktree[tree->parent[a]];
+			parent = iktree[tree->parent[a]];
 			
 		IK_SetParent(seg, parent);
 			
@@ -299,10 +299,10 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 			sub_v3_v3v3(start, pchan->pose_head, pchan->parent->pose_tail);
 		else
 			/* only root bone (a = 0) has no parent */
-			start[0]= start[1]= start[2]= 0.0f;
+			start[0] = start[1] = start[2] = 0.0f;
 		
 		/* change length based on bone size */
-		length= bone->length*len_v3(R_bonemat[1]);
+		length = bone->length * len_v3(R_bonemat[1]);
 		
 		/* compute rest basis and its inverse */
 		copy_m3_m3(rest_basis, bone->bone_mat);
@@ -335,18 +335,18 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 		IK_SetStiffness(seg, IK_Z, pchan->stiffness[2]);
 		
 		if (tree->stretch && (pchan->ikstretch > 0.0f)) {
-			float ikstretch = pchan->ikstretch*pchan->ikstretch;
-			IK_SetStiffness(seg, IK_TRANS_Y, MIN2(1.0f-ikstretch, 0.99f));
+			float ikstretch = pchan->ikstretch * pchan->ikstretch;
+			IK_SetStiffness(seg, IK_TRANS_Y, MIN2(1.0f - ikstretch, 0.99f));
 			IK_SetLimit(seg, IK_TRANS_Y, 0.001, 1e10);
 		}
 	}
 
-	solver= IK_CreateSolver(iktree[0]);
+	solver = IK_CreateSolver(iktree[0]);
 
 	/* set solver goals */
 
 	/* first set the goal inverse transform, assuming the root of tree was done ok! */
-	pchan= tree->pchan[0];
+	pchan = tree->pchan[0];
 	if (pchan->parent) {
 		/* transform goal by parent mat, so this rotation is not part of the
 		 * segment's basis. otherwise rotation limits do not work on the
@@ -363,11 +363,11 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 	mult_m4_m4m4(imat, ob->obmat, rootmat);
 	invert_m4_m4(goalinv, imat);
 	
-	for (target=tree->targets.first; target; target=target->next) {
+	for (target = tree->targets.first; target; target = target->next) {
 		float polepos[3];
-		int poleconstrain= 0;
+		int poleconstrain = 0;
 		
-		data= (bKinematicConstraint*)target->con->data;
+		data = (bKinematicConstraint *)target->con->data;
 		
 		/* 1.0=ctime, we pass on object for auto-ik (owner-type here is object, even though
 		 * strictly speaking, it is a posechannel)
@@ -391,16 +391,16 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 			else {
 				mult_m4_m4m4(goal, goalinv, rootmat);
 				copy_v3_v3(polepos, goal[3]);
-				poleconstrain= 1;
+				poleconstrain = 1;
 
 				/* for pole targets, we blend the result of the ik solver
 				 * instead of the target position, otherwise we can't get
 				 * a smooth transition */
-				resultblend= 1;
-				resultinf= target->con->enforce;
+				resultblend = 1;
+				resultinf = target->con->enforce;
 				
 				if (data->flag & CONSTRAINT_IK_GETANGLE) {
-					poleangledata= data;
+					poleangledata = data;
 					data->flag &= ~CONSTRAINT_IK_GETANGLE;
 				}
 			}
@@ -409,10 +409,10 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 		/* do we need blending? */
 		if (!resultblend && target->con->enforce != 1.0f) {
 			float q1[4], q2[4], q[4];
-			float fac= target->con->enforce;
-			float mfac= 1.0f-fac;
+			float fac = target->con->enforce;
+			float mfac = 1.0f - fac;
 			
-			pchan= tree->pchan[target->tip];
+			pchan = tree->pchan[target->tip];
 			
 			/* end effector in world space */
 			copy_m4_m4(end_pose, pchan->pose_mat);
@@ -420,9 +420,9 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 			mul_serie_m4(world_pose, goalinv, ob->obmat, end_pose, NULL, NULL, NULL, NULL, NULL);
 			
 			/* blend position */
-			goalpos[0]= fac*goalpos[0] + mfac*world_pose[3][0];
-			goalpos[1]= fac*goalpos[1] + mfac*world_pose[3][1];
-			goalpos[2]= fac*goalpos[2] + mfac*world_pose[3][2];
+			goalpos[0] = fac * goalpos[0] + mfac * world_pose[3][0];
+			goalpos[1] = fac * goalpos[1] + mfac * world_pose[3][1];
+			goalpos[2] = fac * goalpos[2] + mfac * world_pose[3][2];
 			
 			/* blend rotation */
 			mat3_to_quat(q1, goalrot);
@@ -431,65 +431,65 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 			quat_to_mat3(goalrot, q);
 		}
 		
-		iktarget= iktree[target->tip];
+		iktarget = iktree[target->tip];
 		
 		if (data->weight != 0.0f) {
 			if (poleconstrain)
 				IK_SolverSetPoleVectorConstraint(solver, iktarget, goalpos,
-					polepos, data->poleangle, (poleangledata == data));
+				                                 polepos, data->poleangle, (poleangledata == data));
 			IK_SolverAddGoal(solver, iktarget, goalpos, data->weight);
 		}
 		if ((data->flag & CONSTRAINT_IK_ROT) && (data->orientweight != 0.0f))
-			if ((data->flag & CONSTRAINT_IK_AUTO)==0)
+			if ((data->flag & CONSTRAINT_IK_AUTO) == 0)
 				IK_SolverAddGoalOrientation(solver, iktarget, goalrot,
-					data->orientweight);
+				                            data->orientweight);
 	}
 
 	/* solve */
 	IK_Solve(solver, 0.0f, tree->iterations);
 
 	if (poleangledata)
-		poleangledata->poleangle= IK_SolverGetPoleAngle(solver);
+		poleangledata->poleangle = IK_SolverGetPoleAngle(solver);
 
 	IK_FreeSolver(solver);
 
 	/* gather basis changes */
-	tree->basis_change= MEM_mallocN(sizeof(float[3][3])*tree->totchannel, "ik basis change");
+	tree->basis_change = MEM_mallocN(sizeof(float[3][3]) * tree->totchannel, "ik basis change");
 	if (hasstretch)
-		ikstretch= MEM_mallocN(sizeof(float)*tree->totchannel, "ik stretch");
+		ikstretch = MEM_mallocN(sizeof(float) * tree->totchannel, "ik stretch");
 	
-	for (a=0; a<tree->totchannel; a++) {
+	for (a = 0; a < tree->totchannel; a++) {
 		IK_GetBasisChange(iktree[a], tree->basis_change[a]);
 		
 		if (hasstretch) {
 			/* have to compensate for scaling received from parent */
 			float parentstretch, stretch;
 			
-			pchan= tree->pchan[a];
-			parentstretch= (tree->parent[a] >= 0)? ikstretch[tree->parent[a]]: 1.0f;
+			pchan = tree->pchan[a];
+			parentstretch = (tree->parent[a] >= 0) ? ikstretch[tree->parent[a]] : 1.0f;
 			
 			if (tree->stretch && (pchan->ikstretch > 0.0f)) {
 				float trans[3], length;
 				
 				IK_GetTranslationChange(iktree[a], trans);
-				length= pchan->bone->length*len_v3(pchan->pose_mat[1]);
+				length = pchan->bone->length * len_v3(pchan->pose_mat[1]);
 				
-				ikstretch[a]= (length == 0.0f)? 1.0f: (trans[1]+length)/length;
+				ikstretch[a] = (length == 0.0f) ? 1.0f : (trans[1] + length) / length;
 			}
 			else
 				ikstretch[a] = 1.0;
 			
-			stretch= (parentstretch == 0.0f)? 1.0f: ikstretch[a]/parentstretch;
+			stretch = (parentstretch == 0.0f) ? 1.0f : ikstretch[a] / parentstretch;
 			
 			mul_v3_fl(tree->basis_change[a][0], stretch);
 			mul_v3_fl(tree->basis_change[a][1], stretch);
 			mul_v3_fl(tree->basis_change[a][2], stretch);
 		}
 
-		if (resultblend && resultinf!=1.0f) {
+		if (resultblend && resultinf != 1.0f) {
 			unit_m3(identity);
 			blend_m3_m3m3(tree->basis_change[a], identity,
-				tree->basis_change[a], resultinf);
+			              tree->basis_change[a], resultinf);
 		}
 		
 		IK_FreeSegment(iktree[a]);
@@ -515,9 +515,9 @@ void iksolver_initialize_tree(struct Scene *UNUSED(scene), struct Object *ob, fl
 {
 	bPoseChannel *pchan;
 	
-	for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 		if (pchan->constflag & PCHAN_HAS_IK) // flag is set on editing constraints
-			initialize_posetree(ob, pchan);	// will attach it to root!
+			initialize_posetree(ob, pchan);  // will attach it to root!
 	}
 	ob->pose->flag &= ~POSE_WAS_REBUILT;
 }
@@ -525,7 +525,7 @@ void iksolver_initialize_tree(struct Scene *UNUSED(scene), struct Object *ob, fl
 void iksolver_execute_tree(struct Scene *scene, struct Object *ob,  struct bPoseChannel *pchan, float ctime)
 {
 	while (pchan->iktree.first) {
-		PoseTree *tree= pchan->iktree.first;
+		PoseTree *tree = pchan->iktree.first;
 		int a;
 		
 		/* stop on the first tree that isn't a standard IK chain */
@@ -533,8 +533,8 @@ void iksolver_execute_tree(struct Scene *scene, struct Object *ob,  struct bPose
 			return;
 		
 		/* 4. walk over the tree for regular solving */
-		for (a=0; a<tree->totchannel; a++) {
-			if (!(tree->pchan[a]->flag & POSE_DONE))	// successive trees can set the flag
+		for (a = 0; a < tree->totchannel; a++) {
+			if (!(tree->pchan[a]->flag & POSE_DONE))    // successive trees can set the flag
 				BKE_pose_where_is_bone(scene, ob, tree->pchan[a], ctime, 1);
 			// tell blender that this channel was controlled by IK, it's cleared on each BKE_pose_where_is()
 			tree->pchan[a]->flag |= POSE_CHAIN;
@@ -544,11 +544,11 @@ void iksolver_execute_tree(struct Scene *scene, struct Object *ob,  struct bPose
 		
 		/* 6. apply the differences to the channels, 
 		 *    we need to calculate the original differences first */
-		for (a=0; a<tree->totchannel; a++) {
+		for (a = 0; a < tree->totchannel; a++) {
 			make_dmats(tree->pchan[a]);
 		}
 		
-		for (a=0; a<tree->totchannel; a++) {
+		for (a = 0; a < tree->totchannel; a++) {
 			/* sets POSE_DONE */
 			where_is_ik_bone(tree->pchan[a], tree->basis_change[a]);
 		}
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index e2646918ea2..548e81a7fc8 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -285,7 +285,7 @@ static int add_name(const char *str)
 
 	additional_slen_offset = 0;
 	
-	if (str[0] == 0 /*  || (str[1]==0) */) return -1;
+	if (str[0] == 0 /*  || (str[1] == 0) */) return -1;
 
 	if (str[0] == '(' && str[1] == '*') {
 		/* we handle function pointer and special array cases here, e.g.
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index fa6b5556565..9fa4d73cead 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -821,7 +821,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 
 				if (prop->flag & PROP_ID_SELF_CHECK) {
 					rna_print_id_get(f, dp);
-					fprintf(f, "	if (id==value.data) return;\n\n");
+					fprintf(f, "	if (id == value.data) return;\n\n");
 				}
 
 				if (prop->flag & PROP_ID_REFCOUNT) {