style cleanup

14 files changed, 410 insertions, 407 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) {
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 4c0115bc794..7cff0679452 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -145,8 +145,8 @@ void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, flo
 
 /* texture.c */
 int multitex_thread(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres, short thread, short which_output) {return 0;}
-int multitex_ext(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres){return 0;}
-int multitex_ext_safe(struct Tex *tex, float *texvec, struct TexResult *texres){return 0;}
+int multitex_ext(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres) {return 0;}
+int multitex_ext_safe(struct Tex *tex, float *texvec, struct TexResult *texres) {return 0;}
 int multitex_nodes(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres, short thread, short which_output, struct ShadeInput *shi, struct MTex *mtex) {return 0;}
 
 struct Material *RE_init_sample_material(struct Material *orig_mat, struct Scene *scene) {return (struct Material *)NULL;}
@@ -155,286 +155,286 @@ void RE_sample_material_color(struct Material *mat, float color[3], float *alpha
                               int face_index, short hit_quad, struct DerivedMesh *orcoDm, struct Object *ob) {}
 
 /* nodes */
-struct RenderResult *RE_GetResult(struct Render *re){return (struct RenderResult *) NULL;}
-struct Render *RE_GetRender(const char *name){return (struct Render *) NULL;}
+struct RenderResult *RE_GetResult(struct Render *re) {return (struct RenderResult *) NULL;}
+struct Render *RE_GetRender(const char *name) {return (struct Render *) NULL;}
 
 /* blenkernel */
-void RE_FreeRenderResult(struct RenderResult *res){}
-void RE_FreeAllRenderResults(void){}
-struct RenderResult *RE_MultilayerConvert(void *exrhandle, int rectx, int recty){return (struct RenderResult *) NULL;}
-void RE_GetResultImage(struct Render *re, struct RenderResult *rr){}
-int RE_RenderInProgress(struct Render *re){return 0;}
-struct Scene *RE_GetScene(struct Render *re){return (struct Scene *) NULL;}
-void RE_Database_Free(struct Render *re){}
-void RE_FreeRender(struct Render *re){}
-void RE_DataBase_GetView(struct Render *re, float mat[][4]){}
-int externtex(struct MTex *mtex, float *vec, float *tin, float *tr, float *tg, float *tb, float *ta){return 0;}
-float texture_value_blend(float tex, float out, float fact, float facg, int blendtype, int flip){return 0.0f;}
-void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg, int blendtype){}
+void RE_FreeRenderResult(struct RenderResult *res) {}
+void RE_FreeAllRenderResults(void) {}
+struct RenderResult *RE_MultilayerConvert(void *exrhandle, int rectx, int recty) {return (struct RenderResult *) NULL;}
+void RE_GetResultImage(struct Render *re, struct RenderResult *rr) {}
+int RE_RenderInProgress(struct Render *re) {return 0;}
+struct Scene *RE_GetScene(struct Render *re) {return (struct Scene *) NULL;}
+void RE_Database_Free(struct Render *re) {}
+void RE_FreeRender(struct Render *re) {}
+void RE_DataBase_GetView(struct Render *re, float mat[][4]) {}
+int externtex(struct MTex *mtex, float *vec, float *tin, float *tr, float *tg, float *tb, float *ta) {return 0;}
+float texture_value_blend(float tex, float out, float fact, float facg, int blendtype, int flip) {return 0.0f;}
+void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg, int blendtype) {}
 char stipple_quarttone[1]; //GLubyte stipple_quarttone[128]
 double elbeemEstimateMemreq(int res, float sx, float sy, float sz, int refine, char *retstr) {return 0.0f;}
-struct Render *RE_NewRender(const char *name){return (struct Render*) NULL;}
-void RE_SwapResult(struct Render *re, struct RenderResult **rr){}
-void RE_BlenderFrame(struct Render *re, struct Scene *scene, int frame){}
+struct Render *RE_NewRender(const char *name) {return (struct Render*) NULL;}
+void RE_SwapResult(struct Render *re, struct RenderResult **rr) {}
+void RE_BlenderFrame(struct Render *re, struct Scene *scene, int frame) {}
 int RE_WriteEnvmapResult(struct ReportList *reports, struct Scene *scene, struct EnvMap *env, const char *relpath, const char imtype, float layout[12]) { return 0; }
 
 /* rna */
-float *give_cursor(struct Scene *scene, struct View3D *v3d){return (float *) NULL;}
-void WM_menutype_free(void){}
-void WM_menutype_freelink(struct MenuType* mt){}
+float *give_cursor(struct Scene *scene, struct View3D *v3d) {return (float *) NULL;}
+void WM_menutype_free(void) {}
+void WM_menutype_freelink(struct MenuType* mt) {}
 int WM_menutype_add(struct MenuType *mt) {return 0;}
-int WM_operator_props_dialog_popup(struct bContext *C, struct wmOperator *op, int width, int height){return 0;}
-int WM_operator_confirm(struct bContext *C, struct wmOperator *op, struct wmEvent *event){return 0;}
-struct MenuType *WM_menutype_find(const char *idname, int quiet){return (struct MenuType *) NULL;}
+int WM_operator_props_dialog_popup(struct bContext *C, struct wmOperator *op, int width, int height) {return 0;}
+int WM_operator_confirm(struct bContext *C, struct wmOperator *op, struct wmEvent *event) {return 0;}
+struct MenuType *WM_menutype_find(const char *idname, int quiet) {return (struct MenuType *) NULL;}
 void WM_operator_stack_clear(struct bContext *C) {}
 
-void WM_autosave_init(struct bContext *C){}
-void WM_jobs_stop_all(struct wmWindowManager *wm){}
-
-char *WM_clipboard_text_get(int selection){return (char*)0;}
-void WM_clipboard_text_set(char *buf, int selection){}
-
-struct wmKeyMapItem *WM_keymap_item_find_id(struct wmKeyMap *keymap, int id){return (struct wmKeyMapItem *) NULL;}
-int WM_enum_search_invoke(struct bContext *C, struct wmOperator *op, struct wmEvent *event){return 0;}
-void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference){}
-void WM_main_add_notifier(unsigned int type, void *reference){}
-void ED_armature_bone_rename(struct bArmature *arm, char *oldnamep, char *newnamep){}
-struct wmEventHandler *WM_event_add_modal_handler(struct bContext *C, struct wmOperator *op){return (struct wmEventHandler *)NULL;}
-struct wmTimer *WM_event_add_timer(struct wmWindowManager *wm, struct wmWindow *win, int event_type, double timestep){return (struct wmTimer *)NULL;}
-void WM_event_remove_timer(struct wmWindowManager *wm, struct wmWindow *win, struct wmTimer *timer){}
-void ED_armature_edit_bone_remove(struct bArmature *arm, struct EditBone *exBone){}
-void object_test_constraints(struct Object *owner){}
-void ED_object_parent(struct Object *ob, struct Object *par, int type, const char *substr){}
-void ED_object_constraint_set_active(struct Object *ob, struct bConstraint *con){}
-void ED_node_composit_default(struct Scene *sce){}
-void *ED_region_draw_cb_activate(struct ARegionType *art, void(*draw)(const struct bContext *, struct ARegion *, void *), void *custumdata, int type){return 0;} /* XXX this one looks weird */
-void *ED_region_draw_cb_customdata(void *handle){return 0;} /* XXX This one looks wrong also */
-void ED_region_draw_cb_exit(struct ARegionType *art, void *handle){}
-void	ED_area_headerprint(struct ScrArea *sa, char *str){}
-
-struct EditBone *ED_armature_bone_get_mirrored(struct ListBase *edbo, struct EditBone *ebo){return (struct EditBone *) NULL;}
-struct EditBone *ED_armature_edit_bone_add(struct bArmature *arm, char *name){return (struct EditBone*) NULL;}
-struct ListBase *get_active_constraints (struct Object *ob){return (struct ListBase *) NULL;}
-struct ListBase *get_constraint_lb(struct Object *ob, struct bConstraint *con, struct bPoseChannel **pchan_r){return (struct ListBase *) NULL;}
-int ED_pose_channel_in_IK_chain(struct Object *ob, struct bPoseChannel *pchan){return 0;}
-
-int ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit){return 0;}
-int ED_space_image_show_render(struct SpaceImage *sima){return 0;}
-int ED_space_image_show_paint(struct SpaceImage *sima){return 0;}
-void ED_space_image_paint_update(struct wmWindowManager *wm, struct ToolSettings *settings){}
-void ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima){}
-struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima){return (struct ImBuf *) NULL;}
-void ED_space_image_uv_sculpt_update(struct wmWindowManager *wm, struct ToolSettings *settings){}
-
-void ED_screen_set_scene(struct bContext *C, struct Scene *scene){}
-void ED_space_clip_set(struct bContext *C, struct SpaceClip *sc, struct MovieClip *clip){}
-
-void ED_area_tag_redraw_regiontype(struct ScrArea *sa, int regiontype){}
+void WM_autosave_init(struct bContext *C) {}
+void WM_jobs_stop_all(struct wmWindowManager *wm) {}
+
+char *WM_clipboard_text_get(int selection) {return (char*)0;}
+void WM_clipboard_text_set(char *buf, int selection) {}
+
+struct wmKeyMapItem *WM_keymap_item_find_id(struct wmKeyMap *keymap, int id) {return (struct wmKeyMapItem *) NULL;}
+int WM_enum_search_invoke(struct bContext *C, struct wmOperator *op, struct wmEvent *event) {return 0;}
+void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference) {}
+void WM_main_add_notifier(unsigned int type, void *reference) {}
+void ED_armature_bone_rename(struct bArmature *arm, char *oldnamep, char *newnamep) {}
+struct wmEventHandler *WM_event_add_modal_handler(struct bContext *C, struct wmOperator *op) {return (struct wmEventHandler *)NULL;}
+struct wmTimer *WM_event_add_timer(struct wmWindowManager *wm, struct wmWindow *win, int event_type, double timestep) {return (struct wmTimer *)NULL;}
+void WM_event_remove_timer(struct wmWindowManager *wm, struct wmWindow *win, struct wmTimer *timer) {}
+void ED_armature_edit_bone_remove(struct bArmature *arm, struct EditBone *exBone) {}
+void object_test_constraints(struct Object *owner) {}
+void ED_object_parent(struct Object *ob, struct Object *par, int type, const char *substr) {}
+void ED_object_constraint_set_active(struct Object *ob, struct bConstraint *con) {}
+void ED_node_composit_default(struct Scene *sce) {}
+void *ED_region_draw_cb_activate(struct ARegionType *art, void(*draw)(const struct bContext *, struct ARegion *, void *), void *custumdata, int type) {return 0;} /* XXX this one looks weird */
+void *ED_region_draw_cb_customdata(void *handle) {return 0;} /* XXX This one looks wrong also */
+void ED_region_draw_cb_exit(struct ARegionType *art, void *handle) {}
+void	ED_area_headerprint(struct ScrArea *sa, char *str) {}
+
+struct EditBone *ED_armature_bone_get_mirrored(struct ListBase *edbo, struct EditBone *ebo) {return (struct EditBone *) NULL;}
+struct EditBone *ED_armature_edit_bone_add(struct bArmature *arm, char *name) {return (struct EditBone*) NULL;}
+struct ListBase *get_active_constraints (struct Object *ob) {return (struct ListBase *) NULL;}
+struct ListBase *get_constraint_lb(struct Object *ob, struct bConstraint *con, struct bPoseChannel **pchan_r) {return (struct ListBase *) NULL;}
+int ED_pose_channel_in_IK_chain(struct Object *ob, struct bPoseChannel *pchan) {return 0;}
+
+int ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit) {return 0;}
+int ED_space_image_show_render(struct SpaceImage *sima) {return 0;}
+int ED_space_image_show_paint(struct SpaceImage *sima) {return 0;}
+void ED_space_image_paint_update(struct wmWindowManager *wm, struct ToolSettings *settings) {}
+void ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima) {}
+struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima) {return (struct ImBuf *) NULL;}
+void ED_space_image_uv_sculpt_update(struct wmWindowManager *wm, struct ToolSettings *settings) {}
+
+void ED_screen_set_scene(struct bContext *C, struct Scene *scene) {}
+void ED_space_clip_set(struct bContext *C, struct SpaceClip *sc, struct MovieClip *clip) {}
+
+void ED_area_tag_redraw_regiontype(struct ScrArea *sa, int regiontype) {}
 void ED_render_engine_changed(struct Main *bmain) {}
 
-struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob){return (struct PTCacheEdit *) NULL;}
-void PE_current_changed(struct Scene *scene, struct Object *ob){}
+struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob) {return (struct PTCacheEdit *) NULL;}
+void PE_current_changed(struct Scene *scene, struct Object *ob) {}
 
 /* rna keymap */
-struct wmKeyMap *WM_keymap_active(struct wmWindowManager *wm, struct wmKeyMap *keymap){return (struct wmKeyMap *) NULL;}
-struct wmKeyMap *WM_keymap_find(struct wmKeyConfig *keyconf, char *idname, int spaceid, int regionid){return (struct wmKeyMap *) NULL;}
-struct wmKeyMap *WM_keymap_add_item(struct wmKeyMap *keymap, char *idname, int type, int val, int modifier, int keymodifier){return (struct wmKeyMap *) NULL;}
-struct wmKeyMap *WM_keymap_copy_to_user(struct wmKeyMap *kemap){return (struct wmKeyMap *) NULL;} 
-struct wmKeyMap *WM_keymap_list_find(struct ListBase *lb, char *idname, int spaceid, int regionid){return (struct wmKeyMap *) NULL;}
-struct wmKeyConfig *WM_keyconfig_new(struct wmWindowManager *wm, char *idname){return (struct wmKeyConfig *) NULL;}
-struct wmKeyConfig *WM_keyconfig_new_user(struct wmWindowManager *wm, char *idname){return (struct wmKeyConfig *) NULL;}
-void WM_keyconfig_remove(struct wmWindowManager *wm, char *idname){}
+struct wmKeyMap *WM_keymap_active(struct wmWindowManager *wm, struct wmKeyMap *keymap) {return (struct wmKeyMap *) NULL;}
+struct wmKeyMap *WM_keymap_find(struct wmKeyConfig *keyconf, char *idname, int spaceid, int regionid) {return (struct wmKeyMap *) NULL;}
+struct wmKeyMap *WM_keymap_add_item(struct wmKeyMap *keymap, char *idname, int type, int val, int modifier, int keymodifier) {return (struct wmKeyMap *) NULL;}
+struct wmKeyMap *WM_keymap_copy_to_user(struct wmKeyMap *kemap) {return (struct wmKeyMap *) NULL;}
+struct wmKeyMap *WM_keymap_list_find(struct ListBase *lb, char *idname, int spaceid, int regionid) {return (struct wmKeyMap *) NULL;}
+struct wmKeyConfig *WM_keyconfig_new(struct wmWindowManager *wm, char *idname) {return (struct wmKeyConfig *) NULL;}
+struct wmKeyConfig *WM_keyconfig_new_user(struct wmWindowManager *wm, char *idname) {return (struct wmKeyConfig *) NULL;}
+void WM_keyconfig_remove(struct wmWindowManager *wm, char *idname) {}
 void WM_keyconfig_set_active(struct wmWindowManager *wm, const char *idname) {}
-void WM_keymap_remove_item(struct wmKeyMap *keymap, struct wmKeyMapItem *kmi){}
-void WM_keymap_restore_to_default(struct wmKeyMap *keymap){}
-void WM_keymap_restore_item_to_default(struct bContext *C, struct wmKeyMap *keymap, struct wmKeyMapItem *kmi){}
-void WM_keymap_properties_reset(struct wmKeyMapItem *kmi){}
+void WM_keymap_remove_item(struct wmKeyMap *keymap, struct wmKeyMapItem *kmi) {}
+void WM_keymap_restore_to_default(struct wmKeyMap *keymap) {}
+void WM_keymap_restore_item_to_default(struct bContext *C, struct wmKeyMap *keymap, struct wmKeyMapItem *kmi) {}
+void WM_keymap_properties_reset(struct wmKeyMapItem *kmi) {}
 void WM_keyconfig_update_tag(struct wmKeyMap *keymap, struct wmKeyMapItem *kmi) {}
-int WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2){return 0;}
+int WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2) {return 0;}
 
 
 /* rna editors */
 struct EditMesh;
 
-struct FCurve *verify_fcurve (struct bAction *act, const char group[], const char rna_path[], const int array_index, short add){return (struct FCurve *) NULL;}
-int insert_vert_fcurve(struct FCurve *fcu, float x, float y, short flag){return 0;}
-void delete_fcurve_key(struct FCurve *fcu, int index, short do_recalc){}
-struct KeyingSetInfo *ANIM_keyingset_info_find_name (const char name[]){return (struct KeyingSetInfo *) NULL;}
-struct KeyingSet *ANIM_scene_get_active_keyingset (struct Scene *scene){return (struct KeyingSet *) NULL;}
-int ANIM_scene_get_keyingset_index(struct Scene *scene, struct KeyingSet *ks){return 0;}
+struct FCurve *verify_fcurve (struct bAction *act, const char group[], const char rna_path[], const int array_index, short add) {return (struct FCurve *) NULL;}
+int insert_vert_fcurve(struct FCurve *fcu, float x, float y, short flag) {return 0;}
+void delete_fcurve_key(struct FCurve *fcu, int index, short do_recalc) {}
+struct KeyingSetInfo *ANIM_keyingset_info_find_name (const char name[]) {return (struct KeyingSetInfo *) NULL;}
+struct KeyingSet *ANIM_scene_get_active_keyingset (struct Scene *scene) {return (struct KeyingSet *) NULL;}
+int ANIM_scene_get_keyingset_index(struct Scene *scene, struct KeyingSet *ks) {return 0;}
 struct ListBase builtin_keyingsets;
-void ANIM_keyingset_info_register(struct KeyingSetInfo *ksi){}
-void ANIM_keyingset_info_unregister(const struct bContext *C, struct KeyingSetInfo *ksi){}
-short ANIM_validate_keyingset(struct bContext *C, struct ListBase *dsources, struct KeyingSet *ks){return 0;}
-short ANIM_add_driver(struct ID *id, const char rna_path[], int array_index, short flag, int type){return 0;}
-short ANIM_remove_driver(struct ID *id, const char rna_path[], int array_index, short flag){return 0;}
-void ED_space_image_release_buffer(struct SpaceImage *sima, void *lock){}
-struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **lock_r){return (struct ImBuf *) NULL;}
+void ANIM_keyingset_info_register(struct KeyingSetInfo *ksi) {}
+void ANIM_keyingset_info_unregister(const struct bContext *C, struct KeyingSetInfo *ksi) {}
+short ANIM_validate_keyingset(struct bContext *C, struct ListBase *dsources, struct KeyingSet *ks) {return 0;}
+short ANIM_add_driver(struct ID *id, const char rna_path[], int array_index, short flag, int type) {return 0;}
+short ANIM_remove_driver(struct ID *id, const char rna_path[], int array_index, short flag) {return 0;}
+void ED_space_image_release_buffer(struct SpaceImage *sima, void *lock) {}
+struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **lock_r) {return (struct ImBuf *) NULL;}
 void ED_space_image_zoom(struct SpaceImage *sima, struct ARegion *ar, float *zoomx, float *zoomy) {}
-char *ED_info_stats_string(struct Scene *scene){return (char *) NULL;}
-void ED_area_tag_redraw(struct ScrArea *sa){}
-void ED_area_tag_refresh(struct ScrArea *sa){}
-void ED_area_newspace(struct bContext *C, struct ScrArea *sa, int type){} 
-void ED_region_tag_redraw(struct ARegion *ar){}
-void WM_event_add_fileselect(struct bContext *C, struct wmOperator *op){}
+char *ED_info_stats_string(struct Scene *scene) {return (char *) NULL;}
+void ED_area_tag_redraw(struct ScrArea *sa) {}
+void ED_area_tag_refresh(struct ScrArea *sa) {}
+void ED_area_newspace(struct bContext *C, struct ScrArea *sa, int type) {}
+void ED_region_tag_redraw(struct ARegion *ar) {}
+void WM_event_add_fileselect(struct bContext *C, struct wmOperator *op) {}
 void WM_cursor_wait(int val) {}
-void ED_node_texture_default(struct Tex *tx){}
-void ED_node_changed_update(struct bContext *C, struct bNode *node){}
-void ED_node_generic_update(struct Main *bmain, struct bNodeTree *ntree, struct bNode *node){}
-void ED_node_tree_update(struct SpaceNode *snode, struct Scene *scene){}
-void ED_view3d_scene_layers_update(struct Main *bmain, struct Scene *scene){}
-int ED_view3d_scene_layer_set(int lay, const int *values){return 0;}
-void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar){}
-void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist){}
-struct BGpic *ED_view3D_background_image_new(struct View3D *v3d){return (struct BGpic *) NULL;}
-void ED_view3D_background_image_remove(struct View3D *v3d, struct BGpic *bgpic){}
-void ED_view3D_background_image_clear(struct View3D *v3d){}
-void ED_view3d_update_viewmat(struct Scene *scene, struct View3D *v3d, struct ARegion *ar, float viewmat[][4], float winmat[][4]){}
-void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist){}
-int text_file_modified(struct Text *text){return 0;}
-void ED_node_shader_default(struct Material *ma){}
-void ED_screen_animation_timer_update(struct bContext *C, int redraws){}
-void ED_base_object_select(struct Base *base, short mode){}
-int ED_object_modifier_remove(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md){return 0;}
-int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene, struct Object *ob, char *name, int type){return 0;}
-void ED_object_modifier_clear(struct Scene *scene, struct Object *ob){}
-void ED_object_enter_editmode(struct bContext *C, int flag){}
-void ED_object_exit_editmode(struct bContext *C, int flag){}
-int uiLayoutGetActive(struct uiLayout *layout){return 0;}
-int uiLayoutGetOperatorContext(struct uiLayout *layout){return 0;}
-int uiLayoutGetAlignment(struct uiLayout *layout){return 0;}
-int uiLayoutGetEnabled(struct uiLayout *layout){return 0;}
-float uiLayoutGetScaleX(struct uiLayout *layout){return 0.0f;}
-float uiLayoutGetScaleY(struct uiLayout *layout){return 0.0f;}
-void uiLayoutSetActive(struct uiLayout *layout, int active){}
-void uiLayoutSetOperatorContext(struct uiLayout *layout, int opcontext){}
-void uiLayoutSetEnabled(struct uiLayout *layout, int enabled){}
-void uiLayoutSetAlignment(struct uiLayout *layout, int alignment){}
-void uiLayoutSetScaleX(struct uiLayout *layout, float scale){}
-void uiLayoutSetScaleY(struct uiLayout *layout, float scale){}
-void ED_base_object_free_and_unlink(struct Scene *scene, struct Base *base){}
-void ED_mesh_calc_normals(struct Mesh *me){}
-void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces){}
-void ED_mesh_material_add(struct Mesh *me, struct Material *ma){}
-void ED_mesh_transform(struct Mesh *me, float *mat){}
-void ED_mesh_update(struct Mesh *mesh, struct bContext *C){}
-void ED_mesh_vertices_add(struct Mesh *mesh, struct ReportList *reports, int count){}
-void ED_mesh_edges_add(struct Mesh *mesh, struct ReportList *reports, int count){}
-void ED_mesh_tessfaces_add(struct Mesh *mesh, struct ReportList *reports, int count){}
-void ED_mesh_loops_add(struct Mesh *mesh, struct ReportList *reports, int count){}
-void ED_mesh_polys_add(struct Mesh *mesh, struct ReportList *reports, int count){}
-void ED_mesh_vertices_remove(struct Mesh *mesh, struct ReportList *reports, int count){}
-void ED_mesh_edges_remove(struct Mesh *mesh, struct ReportList *reports, int count){}
-void ED_mesh_faces_remove(struct Mesh *mesh, struct ReportList *reports, int count){}
-void ED_mesh_material_link(struct Mesh *mesh, struct Material *ma){}
-int ED_mesh_color_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me){return 0;}
-int ED_mesh_uv_texture_add(struct bContext *C, struct Mesh *me){return 0;}
-void ED_object_constraint_dependency_update(struct Scene *scene, struct Object *ob){}
-void ED_object_constraint_update(struct Object *ob){}
-struct bDeformGroup *ED_vgroup_add_name(struct Object *ob, char *name){return (struct bDeformGroup *) NULL;}
-void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode){}
-void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum){}
-void ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum){}
-void ED_vgroup_delete(struct Object *ob, struct bDeformGroup *defgroup){}
-void ED_vgroup_clear(struct Object *ob){}
-void ED_vgroup_object_is_edit_mode(struct Object *ob){}
+void ED_node_texture_default(struct Tex *tx) {}
+void ED_node_changed_update(struct bContext *C, struct bNode *node) {}
+void ED_node_generic_update(struct Main *bmain, struct bNodeTree *ntree, struct bNode *node) {}
+void ED_node_tree_update(struct SpaceNode *snode, struct Scene *scene) {}
+void ED_view3d_scene_layers_update(struct Main *bmain, struct Scene *scene) {}
+int ED_view3d_scene_layer_set(int lay, const int *values) {return 0;}
+void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar) {}
+void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist) {}
+struct BGpic *ED_view3D_background_image_new(struct View3D *v3d) {return (struct BGpic *) NULL;}
+void ED_view3D_background_image_remove(struct View3D *v3d, struct BGpic *bgpic) {}
+void ED_view3D_background_image_clear(struct View3D *v3d) {}
+void ED_view3d_update_viewmat(struct Scene *scene, struct View3D *v3d, struct ARegion *ar, float viewmat[][4], float winmat[][4]) {}
+void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist) {}
+int text_file_modified(struct Text *text) {return 0;}
+void ED_node_shader_default(struct Material *ma) {}
+void ED_screen_animation_timer_update(struct bContext *C, int redraws) {}
+void ED_base_object_select(struct Base *base, short mode) {}
+int ED_object_modifier_remove(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md) {return 0;}
+int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene, struct Object *ob, char *name, int type) {return 0;}
+void ED_object_modifier_clear(struct Scene *scene, struct Object *ob) {}
+void ED_object_enter_editmode(struct bContext *C, int flag) {}
+void ED_object_exit_editmode(struct bContext *C, int flag) {}
+int uiLayoutGetActive(struct uiLayout *layout) {return 0;}
+int uiLayoutGetOperatorContext(struct uiLayout *layout) {return 0;}
+int uiLayoutGetAlignment(struct uiLayout *layout) {return 0;}
+int uiLayoutGetEnabled(struct uiLayout *layout) {return 0;}
+float uiLayoutGetScaleX(struct uiLayout *layout) {return 0.0f;}
+float uiLayoutGetScaleY(struct uiLayout *layout) {return 0.0f;}
+void uiLayoutSetActive(struct uiLayout *layout, int active) {}
+void uiLayoutSetOperatorContext(struct uiLayout *layout, int opcontext) {}
+void uiLayoutSetEnabled(struct uiLayout *layout, int enabled) {}
+void uiLayoutSetAlignment(struct uiLayout *layout, int alignment) {}
+void uiLayoutSetScaleX(struct uiLayout *layout, float scale) {}
+void uiLayoutSetScaleY(struct uiLayout *layout, float scale) {}
+void ED_base_object_free_and_unlink(struct Scene *scene, struct Base *base) {}
+void ED_mesh_calc_normals(struct Mesh *me) {}
+void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces) {}
+void ED_mesh_material_add(struct Mesh *me, struct Material *ma) {}
+void ED_mesh_transform(struct Mesh *me, float *mat) {}
+void ED_mesh_update(struct Mesh *mesh, struct bContext *C) {}
+void ED_mesh_vertices_add(struct Mesh *mesh, struct ReportList *reports, int count) {}
+void ED_mesh_edges_add(struct Mesh *mesh, struct ReportList *reports, int count) {}
+void ED_mesh_tessfaces_add(struct Mesh *mesh, struct ReportList *reports, int count) {}
+void ED_mesh_loops_add(struct Mesh *mesh, struct ReportList *reports, int count) {}
+void ED_mesh_polys_add(struct Mesh *mesh, struct ReportList *reports, int count) {}
+void ED_mesh_vertices_remove(struct Mesh *mesh, struct ReportList *reports, int count) {}
+void ED_mesh_edges_remove(struct Mesh *mesh, struct ReportList *reports, int count) {}
+void ED_mesh_faces_remove(struct Mesh *mesh, struct ReportList *reports, int count) {}
+void ED_mesh_material_link(struct Mesh *mesh, struct Material *ma) {}
+int ED_mesh_color_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me) {return 0;}
+int ED_mesh_uv_texture_add(struct bContext *C, struct Mesh *me) {return 0;}
+void ED_object_constraint_dependency_update(struct Scene *scene, struct Object *ob) {}
+void ED_object_constraint_update(struct Object *ob) {}
+struct bDeformGroup *ED_vgroup_add_name(struct Object *ob, char *name) {return (struct bDeformGroup *) NULL;}
+void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode) {}
+void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum) {}
+void ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum) {}
+void ED_vgroup_delete(struct Object *ob, struct bDeformGroup *defgroup) {}
+void ED_vgroup_clear(struct Object *ob) {}
+void ED_vgroup_object_is_edit_mode(struct Object *ob) {}
 long mesh_mirrtopo_table(struct Object *ob, char mode) { return 0; }
 intptr_t mesh_octree_table(struct Object *ob, struct BMEditMesh *em, float *co, char mode) { return 0; }
 
-void ED_sequencer_update_view(struct bContext *C, int view){}
-float ED_rollBoneToVector(struct EditBone *bone, float new_up_axis[3]){return 0.0f;}
-void ED_space_image_size(struct SpaceImage *sima, int *width, int *height){}
-
-void ED_nurb_set_spline_type(struct Nurb *nu, int type){}
-
-void make_editLatt(struct Object *obedit){}
-void load_editLatt(struct Object *obedit){}
-
-void load_editNurb(struct Object *obedit){}
-void make_editNurb(struct Object *obedit){}
-
-
-void uiItemR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int flag, char *name, int icon){}
-
-struct PointerRNA uiItemFullO(struct uiLayout *layout, char *idname, char *name, int icon, struct IDProperty *properties, int context, int flag){struct PointerRNA a = {{0}}; return a;}
-struct uiLayout *uiLayoutRow(struct uiLayout *layout, int align){return (struct uiLayout *) NULL;}
-struct uiLayout *uiLayoutColumn(struct uiLayout *layout, int align){return (struct uiLayout *) NULL;}
-struct uiLayout *uiLayoutColumnFlow(struct uiLayout *layout, int number, int align){return (struct uiLayout *) NULL;}
-struct uiLayout *uiLayoutBox(struct uiLayout *layout){return (struct uiLayout *) NULL;}
-struct uiLayout *uiLayoutSplit(struct uiLayout *layout, float percentage, int align){return (struct uiLayout *) NULL;}
-int uiLayoutGetRedAlert(struct uiLayout *layout){return 0;}
-void uiLayoutSetRedAlert(struct uiLayout *layout, int redalert){}
-void uiItemsEnumR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname){}
-void uiItemMenuEnumR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, char *name, int icon){}
-void uiItemEnumR_string(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, char *value, char *name, int icon){}
-void uiItemPointerR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, struct PointerRNA *searchptr, char *searchpropname, char *name, int icon){}
-void uiItemPointerSubR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, char *searchpropname, char *name, int icon){}
-void uiItemsEnumO(struct uiLayout *layout, char *opname, char *propname){}
-void uiItemEnumO_string(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value_str){}
-void uiItemMenuEnumO(struct uiLayout *layout, char *opname, char *propname, char *name, int icon){}
-void uiItemBooleanO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, int value){}
-void uiItemIntO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, int value){}
-void uiItemFloatO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, float value){}
-void uiItemStringO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value){}
-void uiItemL(struct uiLayout *layout, const char *name, int icon){}
-void uiItemM(struct uiLayout *layout, struct bContext *C, char *menuname, char *name, int icon){}
-void uiItemS(struct uiLayout *layout){}
-void uiItemFullR(struct uiLayout *layout, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, int value, int flag, char *name, int icon){}
-void uiLayoutSetContextPointer(struct uiLayout *layout, char *name, struct PointerRNA *ptr){}
-char *uiLayoutIntrospect(struct uiLayout *layout){return (char *)NULL;}
+void ED_sequencer_update_view(struct bContext *C, int view) {}
+float ED_rollBoneToVector(struct EditBone *bone, float new_up_axis[3]) {return 0.0f;}
+void ED_space_image_size(struct SpaceImage *sima, int *width, int *height) {}
+
+void ED_nurb_set_spline_type(struct Nurb *nu, int type) {}
+
+void make_editLatt(struct Object *obedit) {}
+void load_editLatt(struct Object *obedit) {}
+
+void load_editNurb(struct Object *obedit) {}
+void make_editNurb(struct Object *obedit) {}
+
+
+void uiItemR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int flag, char *name, int icon) {}
+
+struct PointerRNA uiItemFullO(struct uiLayout *layout, char *idname, char *name, int icon, struct IDProperty *properties, int context, int flag) {struct PointerRNA a = {{0}}; return a;}
+struct uiLayout *uiLayoutRow(struct uiLayout *layout, int align) {return (struct uiLayout *) NULL;}
+struct uiLayout *uiLayoutColumn(struct uiLayout *layout, int align) {return (struct uiLayout *) NULL;}
+struct uiLayout *uiLayoutColumnFlow(struct uiLayout *layout, int number, int align) {return (struct uiLayout *) NULL;}
+struct uiLayout *uiLayoutBox(struct uiLayout *layout) {return (struct uiLayout *) NULL;}
+struct uiLayout *uiLayoutSplit(struct uiLayout *layout, float percentage, int align) {return (struct uiLayout *) NULL;}
+int uiLayoutGetRedAlert(struct uiLayout *layout) {return 0;}
+void uiLayoutSetRedAlert(struct uiLayout *layout, int redalert) {}
+void uiItemsEnumR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname) {}
+void uiItemMenuEnumR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, char *name, int icon) {}
+void uiItemEnumR_string(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, char *value, char *name, int icon) {}
+void uiItemPointerR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, struct PointerRNA *searchptr, char *searchpropname, char *name, int icon) {}
+void uiItemPointerSubR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, char *searchpropname, char *name, int icon) {}
+void uiItemsEnumO(struct uiLayout *layout, char *opname, char *propname) {}
+void uiItemEnumO_string(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value_str) {}
+void uiItemMenuEnumO(struct uiLayout *layout, char *opname, char *propname, char *name, int icon) {}
+void uiItemBooleanO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, int value) {}
+void uiItemIntO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, int value) {}
+void uiItemFloatO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, float value) {}
+void uiItemStringO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value) {}
+void uiItemL(struct uiLayout *layout, const char *name, int icon) {}
+void uiItemM(struct uiLayout *layout, struct bContext *C, char *menuname, char *name, int icon) {}
+void uiItemS(struct uiLayout *layout) {}
+void uiItemFullR(struct uiLayout *layout, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, int value, int flag, char *name, int icon) {}
+void uiLayoutSetContextPointer(struct uiLayout *layout, char *name, struct PointerRNA *ptr) {}
+char *uiLayoutIntrospect(struct uiLayout *layout) {return (char *)NULL;}
 void UI_reinit_font(void) {}
 
 /* rna template */
-void uiTemplateAnyID(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, char *text){}
-void uiTemplatePathBuilder(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *root_ptr, char *text){}
-void uiTemplateHeader(struct uiLayout *layout, struct bContext *C, int menus){}
-void uiTemplateID(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, char *newop, char *unlinkop){}
-struct uiLayout *uiTemplateModifier(struct uiLayout *layout, struct PointerRNA *ptr){return (struct uiLayout *) NULL;}
-struct uiLayout *uiTemplateConstraint(struct uiLayout *layout, struct PointerRNA *ptr){return (struct uiLayout *) NULL;}
-void uiTemplatePreview(struct uiLayout *layout, struct ID *id, int show_buttons, struct ID *parent, struct MTex *slot){}
-void uiTemplateIDPreview(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, char *newop, char *openop, char *unlinkop, int rows, int cols){}
-void uiTemplateCurveMapping(struct uiLayout *layout, struct CurveMapping *cumap, int type, int compact){}
-void uiTemplateColorRamp(struct uiLayout *layout, struct ColorBand *coba, int expand){}
-void uiTemplateLayers(struct uiLayout *layout, struct PointerRNA *ptr, char *propname){}
-void uiTemplateImageLayers(struct uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser){}
-ListBase uiTemplateList(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activepropname, int rows, int listtype){struct ListBase b = {0,0}; return b;}
-void uiTemplateRunningJobs(struct uiLayout *layout, struct bContext *C){}
-void uiTemplateOperatorSearch(struct uiLayout *layout){}
-void uiTemplateHeader3D(struct uiLayout *layout, struct bContext *C){}
-void uiTemplateEditModeSelection(struct uiLayout *layout, struct bContext *C){}
-void uiTemplateTextureImage(struct uiLayout *layout, struct bContext *C, struct Tex *tex){}
-void uiTemplateImage(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *userptr, int compact){}
-void uiTemplateDopeSheetFilter(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr){}
-void uiTemplateColorWheel(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int value_slider){}
-void uiTemplateHistogram(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand){}
-void uiTemplateReportsBanner(struct uiLayout *layout, struct bContext *C, struct wmOperator *op){}
-void uiTemplateWaveform(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand){}
-void uiTemplateVectorscope(struct uiLayout *_self, struct PointerRNA *data, char* property, int expand){}
+void uiTemplateAnyID(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, char *text) {}
+void uiTemplatePathBuilder(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *root_ptr, char *text) {}
+void uiTemplateHeader(struct uiLayout *layout, struct bContext *C, int menus) {}
+void uiTemplateID(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, char *newop, char *unlinkop) {}
+struct uiLayout *uiTemplateModifier(struct uiLayout *layout, struct PointerRNA *ptr) {return (struct uiLayout *) NULL;}
+struct uiLayout *uiTemplateConstraint(struct uiLayout *layout, struct PointerRNA *ptr) {return (struct uiLayout *) NULL;}
+void uiTemplatePreview(struct uiLayout *layout, struct ID *id, int show_buttons, struct ID *parent, struct MTex *slot) {}
+void uiTemplateIDPreview(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, char *newop, char *openop, char *unlinkop, int rows, int cols) {}
+void uiTemplateCurveMapping(struct uiLayout *layout, struct CurveMapping *cumap, int type, int compact) {}
+void uiTemplateColorRamp(struct uiLayout *layout, struct ColorBand *coba, int expand) {}
+void uiTemplateLayers(struct uiLayout *layout, struct PointerRNA *ptr, char *propname) {}
+void uiTemplateImageLayers(struct uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser) {}
+ListBase uiTemplateList(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activepropname, int rows, int listtype) {struct ListBase b = {0,0}; return b;}
+void uiTemplateRunningJobs(struct uiLayout *layout, struct bContext *C) {}
+void uiTemplateOperatorSearch(struct uiLayout *layout) {}
+void uiTemplateHeader3D(struct uiLayout *layout, struct bContext *C) {}
+void uiTemplateEditModeSelection(struct uiLayout *layout, struct bContext *C) {}
+void uiTemplateTextureImage(struct uiLayout *layout, struct bContext *C, struct Tex *tex) {}
+void uiTemplateImage(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *userptr, int compact) {}
+void uiTemplateDopeSheetFilter(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr) {}
+void uiTemplateColorWheel(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int value_slider) {}
+void uiTemplateHistogram(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand) {}
+void uiTemplateReportsBanner(struct uiLayout *layout, struct bContext *C, struct wmOperator *op) {}
+void uiTemplateWaveform(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand) {}
+void uiTemplateVectorscope(struct uiLayout *_self, struct PointerRNA *data, char* property, int expand) {}
 void uiTemplateNodeLink(struct uiLayout *layout, struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *input) {}
 void uiTemplateNodeView(struct uiLayout *layout, struct bContext *C, struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *input) {}
 void uiTemplateTextureUser(struct uiLayout *layout, struct bContext *C) {}
 void uiTemplateTextureShow(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop) {}
-void uiTemplateKeymapItemProperties(struct uiLayout *layout, struct PointerRNA *ptr){}
-void uiTemplateMovieClip(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, int compact){}
-void uiTemplateTrack(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname){}
-void uiTemplateMarker(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname, PointerRNA *userptr, PointerRNA *trackptr, int compact){}
-void uiTemplateImageSettings(struct uiLayout *layout, struct PointerRNA *imfptr){}
+void uiTemplateKeymapItemProperties(struct uiLayout *layout, struct PointerRNA *ptr) {}
+void uiTemplateMovieClip(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, int compact) {}
+void uiTemplateTrack(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname) {}
+void uiTemplateMarker(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname, PointerRNA *userptr, PointerRNA *trackptr, int compact) {}
+void uiTemplateImageSettings(struct uiLayout *layout, struct PointerRNA *imfptr) {}
 
 /* rna render */
-struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h){return (struct RenderResult *) NULL;}
-struct RenderResult *RE_AcquireResultRead(struct Render *re){return (struct RenderResult *) NULL;}
-struct RenderResult *RE_AcquireResultWrite(struct Render *re){return (struct RenderResult *) NULL;}
-struct RenderStats *RE_GetStats(struct Render *re){return (struct RenderStats *) NULL;}
-void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *result){}
+struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h) {return (struct RenderResult *) NULL;}
+struct RenderResult *RE_AcquireResultRead(struct Render *re) {return (struct RenderResult *) NULL;}
+struct RenderResult *RE_AcquireResultWrite(struct Render *re) {return (struct RenderResult *) NULL;}
+struct RenderStats *RE_GetStats(struct Render *re) {return (struct RenderStats *) NULL;}
+void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *result) {}
 void RE_engine_update_progress(struct RenderEngine *engine, float progress) {}
-void RE_engine_end_result(struct RenderEngine *engine, struct RenderResult *result){}
-void RE_engine_update_stats(struct RenderEngine *engine, char *stats, char *info){}
-void RE_layer_load_from_file(struct RenderLayer *layer, struct ReportList *reports, char *filename){}
-void RE_result_load_from_file(struct RenderResult *result, struct ReportList *reports, char *filename){}
-void RE_AcquireResultImage(struct Render *re, struct RenderResult *rr){}
-void RE_ReleaseResult(struct Render *re){}
-void RE_ReleaseResultImage(struct Render *re){}
-int RE_engine_test_break(struct RenderEngine *engine){return 0;}
+void RE_engine_end_result(struct RenderEngine *engine, struct RenderResult *result) {}
+void RE_engine_update_stats(struct RenderEngine *engine, char *stats, char *info) {}
+void RE_layer_load_from_file(struct RenderLayer *layer, struct ReportList *reports, char *filename) {}
+void RE_result_load_from_file(struct RenderResult *result, struct ReportList *reports, char *filename) {}
+void RE_AcquireResultImage(struct Render *re, struct RenderResult *rr) {}
+void RE_ReleaseResult(struct Render *re) {}
+void RE_ReleaseResultImage(struct Render *re) {}
+int RE_engine_test_break(struct RenderEngine *engine) {return 0;}
 void RE_engines_init() {}
 void RE_engines_exit() {}
 void RE_engine_report(struct RenderEngine *engine, int type, const char *msg) {}
@@ -443,43 +443,43 @@ void RE_engine_free(struct RenderEngine *engine) {}
 struct RenderEngineType *RE_engines_find(const char *idname) { return NULL; }
 
 /* python */
-struct wmOperatorType *WM_operatortype_find(const char *idname, int quiet){return (struct wmOperatorType *) NULL;}
-struct GHashIterator *WM_operatortype_iter(){return (struct GHashIterator *) NULL;}
-struct wmOperatorType *WM_operatortype_exists(const char *idname){return (struct wmOperatorType *) NULL;}
-struct wmOperatorTypeMacro *WM_operatortype_macro_define(struct wmOperatorType *ot, const char *idname){return (struct wmOperatorTypeMacro *) NULL;}
-int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, int context, struct PointerRNA *properties, struct ReportList *reports){return 0;}
-int WM_operatortype_remove(const char *idname){return 0;}
-int WM_operator_poll(struct bContext *C, struct wmOperatorType *ot){return 0;}
-int WM_operator_poll_context(struct bContext *C, struct wmOperatorType *ot, int context){return 0;}
-int WM_operator_props_popup(struct bContext *C, struct wmOperator *op, struct wmEvent *event){return 0;}
-void WM_operator_properties_free(struct PointerRNA *ptr){}
-void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring){}
-void WM_operator_properties_create_ptr(struct PointerRNA *ptr, struct wmOperatorType *ot){}
-void WM_operator_properties_sanitize(struct PointerRNA *ptr, const short no_context){};
-void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void*), void *userdata){}
-void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType*, void*), void *userdata){}
-void WM_operator_bl_idname(char *to, const char *from){}
-void WM_operator_py_idname(char *to, const char *from){}
-void WM_operator_ui_popup(struct bContext *C, struct wmOperator *op, int width, int height){}
-short insert_keyframe(struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, short flag){return 0;}
-short delete_keyframe(struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, short flag){return 0;};
-char *WM_operator_pystring(struct bContext *C, struct wmOperatorType *ot, struct PointerRNA *opptr, int all_args){return (char *)NULL;}
-struct wmKeyMapItem *WM_modalkeymap_add_item(struct wmKeyMap *km, int type, int val, int modifier, int keymodifier, int value){return (struct wmKeyMapItem *)NULL;}
-struct wmKeyMapItem *WM_modalkeymap_add_item_str(struct wmKeyMap *km, int type, int val, int modifier, int keymodifier, const char *value){return (struct wmKeyMapItem *)NULL;}
-struct wmKeyMap *WM_modalkeymap_add(struct wmKeyConfig *keyconf, char *idname, EnumPropertyItem *items){return (struct wmKeyMap *) NULL;}
+struct wmOperatorType *WM_operatortype_find(const char *idname, int quiet) {return (struct wmOperatorType *) NULL;}
+struct GHashIterator *WM_operatortype_iter() {return (struct GHashIterator *) NULL;}
+struct wmOperatorType *WM_operatortype_exists(const char *idname) {return (struct wmOperatorType *) NULL;}
+struct wmOperatorTypeMacro *WM_operatortype_macro_define(struct wmOperatorType *ot, const char *idname) {return (struct wmOperatorTypeMacro *) NULL;}
+int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, int context, struct PointerRNA *properties, struct ReportList *reports) {return 0;}
+int WM_operatortype_remove(const char *idname) {return 0;}
+int WM_operator_poll(struct bContext *C, struct wmOperatorType *ot) {return 0;}
+int WM_operator_poll_context(struct bContext *C, struct wmOperatorType *ot, int context) {return 0;}
+int WM_operator_props_popup(struct bContext *C, struct wmOperator *op, struct wmEvent *event) {return 0;}
+void WM_operator_properties_free(struct PointerRNA *ptr) {}
+void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring) {}
+void WM_operator_properties_create_ptr(struct PointerRNA *ptr, struct wmOperatorType *ot) {}
+void WM_operator_properties_sanitize(struct PointerRNA *ptr, const short no_context) {};
+void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void*), void *userdata) {}
+void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType*, void*), void *userdata) {}
+void WM_operator_bl_idname(char *to, const char *from) {}
+void WM_operator_py_idname(char *to, const char *from) {}
+void WM_operator_ui_popup(struct bContext *C, struct wmOperator *op, int width, int height) {}
+short insert_keyframe(struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, short flag) {return 0;}
+short delete_keyframe(struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, short flag) {return 0;};
+char *WM_operator_pystring(struct bContext *C, struct wmOperatorType *ot, struct PointerRNA *opptr, int all_args) {return (char *)NULL;}
+struct wmKeyMapItem *WM_modalkeymap_add_item(struct wmKeyMap *km, int type, int val, int modifier, int keymodifier, int value) {return (struct wmKeyMapItem *)NULL;}
+struct wmKeyMapItem *WM_modalkeymap_add_item_str(struct wmKeyMap *km, int type, int val, int modifier, int keymodifier, const char *value) {return (struct wmKeyMapItem *)NULL;}
+struct wmKeyMap *WM_modalkeymap_add(struct wmKeyConfig *keyconf, char *idname, EnumPropertyItem *items) {return (struct wmKeyMap *) NULL;}
 
 /* RNA COLLADA dependency */
-int collada_export(struct Scene *sce, const char *filepath){ return 0; }
+int collada_export(struct Scene *sce, const char *filepath) { return 0; }
 
 int sculpt_get_brush_size(struct Brush *brush) {return 0;}
 void sculpt_set_brush_size(struct Brush *brush, int size) {}
-int sculpt_get_lock_brush_size(struct Brush *brush){ return 0;}
-float sculpt_get_brush_unprojected_radius(struct Brush *brush){return 0.0f;}
-void sculpt_set_brush_unprojected_radius(struct Brush *brush, float unprojected_radius){}
-float sculpt_get_brush_alpha(struct Brush *brush){return 0.0f;}
-void sculpt_set_brush_alpha(struct Brush *brush, float alpha){}
-void ED_sculpt_modifiers_changed(struct Object *ob){}
-void ED_mesh_calc_tessface(struct Mesh *mesh){}
+int sculpt_get_lock_brush_size(struct Brush *brush) { return 0;}
+float sculpt_get_brush_unprojected_radius(struct Brush *brush) {return 0.0f;}
+void sculpt_set_brush_unprojected_radius(struct Brush *brush, float unprojected_radius) {}
+float sculpt_get_brush_alpha(struct Brush *brush) {return 0.0f;}
+void sculpt_set_brush_alpha(struct Brush *brush, float alpha) {}
+void ED_sculpt_modifiers_changed(struct Object *ob) {}
+void ED_mesh_calc_tessface(struct Mesh *mesh) {}
 
 /* bpy/python internal api */
 void operator_wrapper(struct wmOperatorType *ot, void *userdata) {}
@@ -491,9 +491,9 @@ float BPY_driver_exec(struct ChannelDriver *driver, const float evaltime) {retur
 void BPY_DECREF(void *pyob_ptr) {}
 void BPY_pyconstraint_exec(struct bPythonConstraint *con, struct bConstraintOb *cob, struct ListBase *targets) {}
 void macro_wrapper(struct wmOperatorType *ot, void *userdata) {}
-int pyrna_id_FromPyObject(struct PyObject *obj, struct ID **id){ return 0; }
+int pyrna_id_FromPyObject(struct PyObject *obj, struct ID **id) { return 0; }
 struct PyObject *pyrna_id_CreatePyObject(struct ID *id) {return NULL; }
-void BPY_context_update(struct bContext *C){};
+void BPY_context_update(struct bContext *C) {};
 
 /* intern/dualcon */
 struct DualConMesh;