svn merge ^/trunk/blender -r40644:40720

12 files changed, 238 insertions, 163 deletions

diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 19027647537..622ea38a80c 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -742,7 +742,7 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
 	MDeformVert *dvert = NULL;
 	Cloth *clothObj = NULL;
 	int numverts;
-	float goalfac = 0;
+	/* float goalfac = 0; */ /* UNUSED */
 	ClothVertex *verts = NULL;
 
 	if (!clmd || !dm) return;
@@ -765,7 +765,7 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
 					if (( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_mass-1)) && (clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL ))
 					{
 						verts->goal = dvert->dw [j].weight;
-						goalfac= 1.0f;
+						/* goalfac= 1.0f; */ /* UNUSED */
 						
 						/*
 						// Kicking goal factor to simplify things...who uses that anyway?
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index fcf9f69ed0c..bb918b3f3f0 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -2365,7 +2365,7 @@ int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, fl
 {
 	Cloth *cloth= clmd->clothObject;
 	BVHTree *cloth_bvh= cloth->bvhtree;
-	unsigned int i=0, numfaces = 0, numverts = 0, k, l, j;
+	unsigned int i=0, /* numfaces = 0, */ /* UNUSED */ numverts = 0, k, l, j;
 	int rounds = 0; // result counts applied collisions; ic is for debug output;
 	ClothVertex *verts = NULL;
 	int ret = 0, ret2 = 0;
@@ -2376,7 +2376,7 @@ int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, fl
 		return 0;
 	
 	verts = cloth->verts;
-	numfaces = cloth->numfaces;
+	/* numfaces = cloth->numfaces; */ /* UNUSED */
 	numverts = cloth->numverts;
 
 	////////////////////////////////////////////////////////////
@@ -2478,7 +2478,7 @@ int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, fl
 				// collisions = 1;
 				verts = cloth->verts; // needed for openMP
 	
-				numfaces = cloth->numfaces;
+				/* numfaces = cloth->numfaces; */ /* UNUSED */
 				numverts = cloth->numverts;
 	
 				verts = cloth->verts;
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 61e9daf4138..7747e4750b7 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -361,72 +361,70 @@ void curvemap_sethandle(CurveMap *cuma, int type)
 static void calchandle_curvemap(BezTriple *bezt, BezTriple *prev, BezTriple *next, int UNUSED(mode))
 {
 	float *p1,*p2,*p3,pt[3];
-	float dx1,dy1, dx,dy, vx,vy, len,len1,len2;
-	
-	if(bezt->h1==0 && bezt->h2==0) return;
+	float len,len_a, len_b;
+	float dvec_a[2], dvec_b[2];
+
+	if(bezt->h1==0 && bezt->h2==0) {
+		return;
+	}
 	
 	p2= bezt->vec[1];
 	
 	if(prev==NULL) {
 		p3= next->vec[1];
-		pt[0]= 2*p2[0]- p3[0];
-		pt[1]= 2*p2[1]- p3[1];
+		pt[0]= 2.0f*p2[0] - p3[0];
+		pt[1]= 2.0f*p2[1] - p3[1];
 		p1= pt;
 	}
-	else p1= prev->vec[1];
+	else {
+		p1= prev->vec[1];
+	}
 	
 	if(next==NULL) {
 		p1= prev->vec[1];
-		pt[0]= 2*p2[0]- p1[0];
-		pt[1]= 2*p2[1]- p1[1];
+		pt[0]= 2.0f*p2[0] - p1[0];
+		pt[1]= 2.0f*p2[1] - p1[1];
 		p3= pt;
 	}
-	else p3= next->vec[1];
-	
-	dx= p2[0]- p1[0];
-	dy= p2[1]- p1[1];
+	else {
+		p3= next->vec[1];
+	}
 
-	len1= (float)sqrt(dx*dx+dy*dy);
-	
-	dx1= p3[0]- p2[0];
-	dy1= p3[1]- p2[1];
+	sub_v2_v2v2(dvec_a, p2, p1);
+	sub_v2_v2v2(dvec_b, p3, p2);
 
-	len2= (float)sqrt(dx1*dx1+dy1*dy1);
-	
-	if(len1==0.0f) len1=1.0f;
-	if(len2==0.0f) len2=1.0f;
-	
-	if(bezt->h1==HD_AUTO || bezt->h2==HD_AUTO) {    /* auto */
-		vx= dx1/len2 + dx/len1;
-		vy= dy1/len2 + dy/len1;
-		
-		len= 2.5614f*(float)sqrt(vx*vx + vy*vy);
+	len_a= len_v2(dvec_a);
+	len_b= len_v2(dvec_b);
+
+	if(len_a==0.0f) len_a=1.0f;
+	if(len_b==0.0f) len_b=1.0f;
+
+	if(bezt->h1==HD_AUTO || bezt->h2==HD_AUTO) { /* auto */
+		float tvec[2];
+		tvec[0]= dvec_b[0]/len_b + dvec_a[0]/len_a;
+		tvec[1]= dvec_b[1]/len_b + dvec_a[1]/len_a;
+
+		len= len_v2(tvec) * 2.5614f;
 		if(len!=0.0f) {
 			
 			if(bezt->h1==HD_AUTO) {
-				len1/=len;
-				*(p2-3)= *p2-vx*len1;
-				*(p2-2)= *(p2+1)-vy*len1;
+				len_a/=len;
+				madd_v2_v2v2fl(p2-3, p2, tvec, -len_a);
 			}
 			if(bezt->h2==HD_AUTO) {
-				len2/=len;
-				*(p2+3)= *p2+vx*len2;
-				*(p2+4)= *(p2+1)+vy*len2;
+				len_b/=len;
+				madd_v2_v2v2fl(p2+3, p2, tvec,  len_b);
 			}
 		}
 	}
 
 	if(bezt->h1==HD_VECT) {	/* vector */
-		dx/=3.0f;
-		dy/=3.0f;
-		*(p2-3)= *p2-dx;
-		*(p2-2)= *(p2+1)-dy;
+		mul_v2_fl(dvec_a, 1.0f/3.0f);
+		sub_v2_v2v2(p2-3, p2, dvec_a);
 	}
 	if(bezt->h2==HD_VECT) {
-		dx1/=3.0f;
-		dy1/=3.0f;
-		*(p2+3)= *p2+dx1;
-		*(p2+4)= *(p2+1)+dy1;
+		mul_v2_fl(dvec_b, 1.0f/3.0f);
+		sub_v2_v2v2(p2+3, p2, dvec_b);
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index c0d2eca9217..3bf3c0f9ed8 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -2458,72 +2458,77 @@ void makeBevelList(Object *ob)
 void calchandleNurb(BezTriple *bezt, BezTriple *prev, BezTriple *next, int mode)
 {
 	float *p1,*p2,*p3, pt[3];
-	float dx1,dy1,dz1,dx,dy,dz,vx,vy,vz,len,len1,len2;
+	float dvec_a[3], dvec_b[3];
+	float len, len_a, len_b;
 	const float eps= 1e-5;
 
-	if(bezt->h1==0 && bezt->h2==0) return;
+	if(bezt->h1==0 && bezt->h2==0) {
+		return;
+	}
 
 	p2= bezt->vec[1];
 
 	if(prev==NULL) {
 		p3= next->vec[1];
-		pt[0]= 2*p2[0]- p3[0];
-		pt[1]= 2*p2[1]- p3[1];
-		pt[2]= 2*p2[2]- p3[2];
+		pt[0]= 2.0f*p2[0] - p3[0];
+		pt[1]= 2.0f*p2[1] - p3[1];
+		pt[2]= 2.0f*p2[2] - p3[2];
 		p1= pt;
 	}
-	else p1= prev->vec[1];
+	else {
+		p1= prev->vec[1];
+	}
 
 	if(next==NULL) {
-		pt[0]= 2*p2[0]- p1[0];
-		pt[1]= 2*p2[1]- p1[1];
-		pt[2]= 2*p2[2]- p1[2];
+		pt[0]= 2.0f*p2[0] - p1[0];
+		pt[1]= 2.0f*p2[1] - p1[1];
+		pt[2]= 2.0f*p2[2] - p1[2];
 		p3= pt;
 	}
-	else p3= next->vec[1];
+	else {
+		p3= next->vec[1];
+	}
 
-	dx= p2[0]- p1[0];
-	dy= p2[1]- p1[1];
-	dz= p2[2]- p1[2];
-	
-	if(mode) len1= dx;
-	else len1= (float)sqrt(dx*dx+dy*dy+dz*dz);
-	
-	dx1= p3[0]- p2[0];
-	dy1= p3[1]- p2[1];
-	dz1= p3[2]- p2[2];
-	
-	if(mode) len2= dx1;
-	else len2= (float)sqrt(dx1*dx1+dy1*dy1+dz1*dz1);
+	sub_v3_v3v3(dvec_a, p2, p1);
+	sub_v3_v3v3(dvec_b, p3, p2);
+
+	if (mode != 0) {
+		len_a= dvec_a[0];
+		len_b= dvec_b[0];
+	}
+	else {
+		len_a= len_v3(dvec_a);
+		len_b= len_v3(dvec_b);
+	}
 
-	if(len1==0.0f) len1=1.0f;
-	if(len2==0.0f) len2=1.0f;
+	if(len_a==0.0f) len_a=1.0f;
+	if(len_b==0.0f) len_b=1.0f;
 
 
 	if(ELEM(bezt->h1,HD_AUTO,HD_AUTO_ANIM) || ELEM(bezt->h2,HD_AUTO,HD_AUTO_ANIM)) {    /* auto */
-		vx= dx1/len2 + dx/len1;
-		vy= dy1/len2 + dy/len1;
-		vz= dz1/len2 + dz/len1;
-		len= 2.5614f*(float)sqrt(vx*vx + vy*vy + vz*vz);
+		float tvec[3];
+		tvec[0]= dvec_b[0]/len_b + dvec_a[0]/len_a;
+		tvec[1]= dvec_b[1]/len_b + dvec_a[1]/len_a;
+		tvec[2]= dvec_b[2]/len_b + dvec_a[2]/len_a;
+		len= len_v3(tvec) * 2.5614f;
+
 		if(len!=0.0f) {
 			int leftviolate=0, rightviolate=0;	/* for mode==2 */
 			
-			if(len1>5.0f*len2) len1= 5.0f*len2;	
-			if(len2>5.0f*len1) len2= 5.0f*len1;
+			if(len_a>5.0f*len_b) len_a= 5.0f*len_b;
+			if(len_b>5.0f*len_a) len_b= 5.0f*len_a;
 			
 			if(ELEM(bezt->h1,HD_AUTO,HD_AUTO_ANIM)) {
-				len1/=len;
-				*(p2-3)= *p2-vx*len1;
-				*(p2-2)= *(p2+1)-vy*len1;
-				*(p2-1)= *(p2+2)-vz*len1;
+				len_a/=len;
+				madd_v3_v3v3fl(p2-3, p2, tvec, -len_a);
 				
-				if((bezt->h1==HD_AUTO_ANIM) && next && prev) {	// keep horizontal if extrema
+				if((bezt->h1==HD_AUTO_ANIM) && next && prev) { /* keep horizontal if extrema */
 					float ydiff1= prev->vec[1][1] - bezt->vec[1][1];
 					float ydiff2= next->vec[1][1] - bezt->vec[1][1];
 					if( (ydiff1 <= 0.0f && ydiff2 <= 0.0f) || (ydiff1 >= 0.0f && ydiff2 >= 0.0f) ) {
 						bezt->vec[0][1]= bezt->vec[1][1];
 					}
-					else {						// handles should not be beyond y coord of two others
+					else { /* handles should not be beyond y coord of two others */
 						if(ydiff1 <= 0.0f) {
 							if(prev->vec[1][1] > bezt->vec[0][1]) {
 								bezt->vec[0][1]= prev->vec[1][1]; 
@@ -2540,18 +2545,16 @@ void calchandleNurb(BezTriple *bezt, BezTriple *prev, BezTriple *next, int mode)
 				}
 			}
 			if(ELEM(bezt->h2,HD_AUTO,HD_AUTO_ANIM)) {
-				len2/=len;
-				*(p2+3)= *p2+vx*len2;
-				*(p2+4)= *(p2+1)+vy*len2;
-				*(p2+5)= *(p2+2)+vz*len2;
+				len_b/=len;
+				madd_v3_v3v3fl(p2+3, p2, tvec,  len_b);
 				
-				if((bezt->h2==HD_AUTO_ANIM) && next && prev) {	// keep horizontal if extrema
+				if((bezt->h2==HD_AUTO_ANIM) && next && prev) { /* keep horizontal if extrema */
 					float ydiff1= prev->vec[1][1] - bezt->vec[1][1];
 					float ydiff2= next->vec[1][1] - bezt->vec[1][1];
 					if( (ydiff1 <= 0.0f && ydiff2 <= 0.0f) || (ydiff1 >= 0.0f && ydiff2 >= 0.0f) ) {
 						bezt->vec[2][1]= bezt->vec[1][1];
 					}
-					else {						// handles should not be beyond y coord of two others
+					else { /* andles should not be beyond y coord of two others */
 						if(ydiff1 <= 0.0f) {
 							if(next->vec[1][1] < bezt->vec[2][1]) {
 								bezt->vec[2][1]= next->vec[1][1]; 
@@ -2567,25 +2570,25 @@ void calchandleNurb(BezTriple *bezt, BezTriple *prev, BezTriple *next, int mode)
 					}
 				}
 			}
-			if(leftviolate || rightviolate) {	/* align left handle */
+			if(leftviolate || rightviolate) { /* align left handle */
 				float h1[3], h2[3];
+				float dot;
 				
 				sub_v3_v3v3(h1, p2-3, p2);
 				sub_v3_v3v3(h2, p2, p2+3);
-				len1= normalize_v3(h1);
-				len2= normalize_v3(h2);
 
-				vz= dot_v3v3(h1, h2);
+				len_a= normalize_v3(h1);
+				len_b= normalize_v3(h2);
+
+				dot= dot_v3v3(h1, h2);
 
 				if(leftviolate) {
-					*(p2+3)= *(p2)   - vz*len2*h1[0];
-					*(p2+4)= *(p2+1) - vz*len2*h1[1];
-					*(p2+5)= *(p2+2) - vz*len2*h1[2];
+					mul_v3_fl(h1, dot * len_b);
+					sub_v3_v3v3(p2+3, p2, h1);
 				}
 				else {
-					*(p2-3)= *(p2)   + vz*len1*h2[0];
-					*(p2-2)= *(p2+1) + vz*len1*h2[1];
-					*(p2-1)= *(p2+2) + vz*len1*h2[2];
+					mul_v3_fl(h2, dot * len_a);
+					add_v3_v3v3(p2-3, p2, h2);
 				}
 			}
 			
@@ -2593,60 +2596,52 @@ void calchandleNurb(BezTriple *bezt, BezTriple *prev, BezTriple *next, int mode)
 	}
 
 	if(bezt->h1==HD_VECT) {	/* vector */
-		dx/=3.0f;
-		dy/=3.0f;
-		dz/=3.0f;
-		*(p2-3)= *p2-dx;
-		*(p2-2)= *(p2+1)-dy;
-		*(p2-1)= *(p2+2)-dz;
+		mul_v3_fl(dvec_a, 1.0f/3.0f);
+		sub_v3_v3v3(p2-3, p2, dvec_a);
 	}
 	if(bezt->h2==HD_VECT) {
-		dx1/=3.0f;
-		dy1/=3.0f;
-		dz1/=3.0f;
-		*(p2+3)= *p2+dx1;
-		*(p2+4)= *(p2+1)+dy1;
-		*(p2+5)= *(p2+2)+dz1;
+		mul_v3_fl(dvec_b, 1.0f/3.0f);
+		sub_v3_v3v3(p2+3, p2, dvec_b);
 	}
 
-	len2= len_v3v3(p2, p2+3);
-	len1= len_v3v3(p2, p2-3);
-	if(len1==0.0f) len1= 1.0f;
-	if(len2==0.0f) len2= 1.0f;
+	len_b= len_v3v3(p2, p2+3);
+	len_a= len_v3v3(p2, p2-3);
+	if(len_a==0.0f) len_a= 1.0f;
+	if(len_b==0.0f) len_b= 1.0f;
 
 	if(bezt->f1 & SELECT) { /* order of calculation */
-		if(bezt->h2==HD_ALIGN) {	/* aligned */
-			if(len1>eps) {
-				len= len2/len1;
-				p2[3]= p2[0]+len*(p2[0]-p2[-3]);
-				p2[4]= p2[1]+len*(p2[1]-p2[-2]);
-				p2[5]= p2[2]+len*(p2[2]-p2[-1]);
+		if(bezt->h2==HD_ALIGN) { /* aligned */
+			if(len_a>eps) {
+				len= len_b/len_a;
+				p2[3]= p2[0]+len*(p2[0] - p2[-3]);
+				p2[4]= p2[1]+len*(p2[1] - p2[-2]);
+				p2[5]= p2[2]+len*(p2[2] - p2[-1]);
 			}
 		}
 		if(bezt->h1==HD_ALIGN) {
-			if(len2>eps) {
-				len= len1/len2;
-				p2[-3]= p2[0]+len*(p2[0]-p2[3]);
-				p2[-2]= p2[1]+len*(p2[1]-p2[4]);
-				p2[-1]= p2[2]+len*(p2[2]-p2[5]);
+			if(len_b>eps) {
+				len= len_a/len_b;
+				p2[-3]= p2[0]+len*(p2[0] - p2[3]);
+				p2[-2]= p2[1]+len*(p2[1] - p2[4]);
+				p2[-1]= p2[2]+len*(p2[2] - p2[5]);
 			}
 		}
 	}
 	else {
 		if(bezt->h1==HD_ALIGN) {
-			if(len2>eps) {
-				len= len1/len2;
-				p2[-3]= p2[0]+len*(p2[0]-p2[3]);
-				p2[-2]= p2[1]+len*(p2[1]-p2[4]);
-				p2[-1]= p2[2]+len*(p2[2]-p2[5]);
+			if(len_b>eps) {
+				len= len_a/len_b;
+				p2[-3]= p2[0]+len*(p2[0] - p2[3]);
+				p2[-2]= p2[1]+len*(p2[1] - p2[4]);
+				p2[-1]= p2[2]+len*(p2[2] - p2[5]);
 			}
 		}
 		if(bezt->h2==HD_ALIGN) {	/* aligned */
-			if(len1>eps) {
-				len= len2/len1;
-				p2[3]= p2[0]+len*(p2[0]-p2[-3]);
-				p2[4]= p2[1]+len*(p2[1]-p2[-2]);
-				p2[5]= p2[2]+len*(p2[2]-p2[-1]);
+			if(len_a>eps) {
+				len= len_b/len_a;
+				p2[3]= p2[0]+len*(p2[0] - p2[-3]);
+				p2[4]= p2[1]+len*(p2[1] - p2[-2]);
+				p2[5]= p2[2]+len*(p2[2] - p2[-1]);
 			}
 		}
 	}
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 3916d0ca701..8ea80ae9296 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -818,7 +818,7 @@ void calchandles_fcurve (FCurve *fcu)
  * 		-> Vector handles: become 'nothing' when (one half selected AND other not)
  *  - PHASE 2: recalculate handles
 */
-void testhandles_fcurve (FCurve *fcu)
+void testhandles_fcurve (FCurve *fcu, const short use_handle)
 {
 	BezTriple *bezt;
 	unsigned int a;
@@ -834,9 +834,16 @@ void testhandles_fcurve (FCurve *fcu)
 		/* flag is initialised as selection status
 		 * of beztriple control-points (labelled 0,1,2)
 		 */
-		if (bezt->f1 & SELECT) flag |= (1<<0); // == 1
 		if (bezt->f2 & SELECT) flag |= (1<<1); // == 2
-		if (bezt->f3 & SELECT) flag |= (1<<2); // == 4
+		if(use_handle == FALSE) {
+			if(flag & 2) {
+				flag |= (1<<0) | (1<<2);
+			}
+		}
+		else {
+			if (bezt->f1 & SELECT) flag |= (1<<0); // == 1
+			if (bezt->f3 & SELECT) flag |= (1<<2); // == 4
+		}
 		
 		/* one or two handles selected only */
 		if (ELEM(flag, 0, 7)==0) {
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index 295669c98c0..cef3eee8c5e 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -913,7 +913,7 @@ static int  cg_filtered(lfVector *ldV, fmatrix3x3 *lA, lfVector *lB, lfVector *z
 {
 	// Solves for unknown X in equation AX=B
 	unsigned int conjgrad_loopcount=0, conjgrad_looplimit=100;
-	float conjgrad_epsilon=0.0001f, conjgrad_lasterror=0;
+	float conjgrad_epsilon=0.0001f /* , conjgrad_lasterror=0 */ /* UNUSED */;
 	lfVector *q, *d, *tmp, *r; 
 	float s, starget, a, s_prev;
 	unsigned int numverts = lA[0].vcount;
@@ -964,7 +964,7 @@ static int  cg_filtered(lfVector *ldV, fmatrix3x3 *lA, lfVector *lB, lfVector *z
 
 		conjgrad_loopcount++;
 	}
-	conjgrad_lasterror = s;
+	/* conjgrad_lasterror = s; */ /* UNUSED */
 
 	del_lfvector(q);
 	del_lfvector(d);
@@ -1777,7 +1777,7 @@ int cloth_calc_helper_forces(Object *UNUSED(ob), ClothModifierData * clmd, float
 	steps = 55;
 	for (i=0; i<steps; i++) {
 		for (node=cloth->springs; node; node=node->next) {
-			ClothVertex *cv1, *cv2;
+			/* ClothVertex *cv1, *cv2; */ /* UNUSED */
 			int v1, v2;
 			float len, c, l, vec[3];
 			
@@ -1786,8 +1786,8 @@ int cloth_calc_helper_forces(Object *UNUSED(ob), ClothModifierData * clmd, float
 				continue;
 			
 			v1 = spring->ij; v2 = spring->kl;
-			cv1 = cloth->verts + v1;
-			cv2 = cloth->verts + v2;
+			/* cv1 = cloth->verts + v1; */ /* UNUSED */
+			/* cv2 = cloth->verts + v2; */ /* UNUSED */
 			len = len_v3v3(cos[v1], cos[v2]);
 			
 			sub_v3_v3v3(vec, cos[v1], cos[v2]);
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 5df07246b73..48995572117 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -1177,7 +1177,7 @@ static void old_mdisps_convert(MFace *mface, MDisps *mdisp)
 	int nvert = (mface->v4)? 4: 3;
 	int newtotdisp = multires_grid_tot[newlvl]*nvert;
 	int x, y, S;
-	float (*disps)[3], (*out)[3], u, v;
+	float (*disps)[3], (*out)[3], u = 0.0f, v = 0.0f; /* Quite gcc barking. */
 
 	disps = BLI_cellalloc_calloc(sizeof(float) * 3 * newtotdisp, "multires disps");
 
diff --git a/source/blender/blenkernel/intern/navmesh_conversion.c b/source/blender/blenkernel/intern/navmesh_conversion.c
index 8a2ec1e5169..04f6ff19564 100644
--- a/source/blender/blenkernel/intern/navmesh_conversion.c
+++ b/source/blender/blenkernel/intern/navmesh_conversion.c
@@ -328,14 +328,10 @@ struct SortContext
 	const int* trisToFacesMap;
 };
 
-/* XXX: not thread-safe, but it's called only from modifiers stack
-        which isn't threaded. Anyway, better to avoid this in the future */
-static struct SortContext *_qsort_context;
-
-static int compareByData(const void * a, const void * b)
+static int compareByData(void *ctx, const void * a, const void * b)
 {
-	return ( _qsort_context->recastData[_qsort_context->trisToFacesMap[*(int*)a]] -
-			_qsort_context->recastData[_qsort_context->trisToFacesMap[*(int*)b]] );
+	return (((struct SortContext *)ctx)->recastData[((struct SortContext *)ctx)->trisToFacesMap[*(int*)a]] -
+			((struct SortContext *)ctx)->recastData[((struct SortContext *)ctx)->trisToFacesMap[*(int*)b]] );
 }
 
 int buildNavMeshData(const int nverts, const float* verts, 
@@ -367,8 +363,7 @@ int buildNavMeshData(const int nverts, const float* verts,
 		trisMapping[i]=i;
 	context.recastData = recastData;
 	context.trisToFacesMap = trisToFacesMap;
-	_qsort_context = &context;
-	qsort(trisMapping, ntris, sizeof(int), compareByData);
+	recast_qsort(trisMapping, ntris, sizeof(int), &context, compareByData);
 
 	//search first valid triangle - triangle of convex polygon
 	validTriStart = -1;
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index e7203775a22..13d891dcd64 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3067,6 +3067,82 @@ void object_camera_matrix(
 
 }
 
+void camera_view_frame_ex(Scene *scene, Camera *camera, float drawsize, const short do_clip, const float scale[3],
+                          float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3])
+{
+	float aspx, aspy;
+	float facx, facy;
+	float depth;
+
+	/* aspect correcton */
+	if (scene) {
+		aspx= (float) scene->r.xsch*scene->r.xasp;
+		aspy= (float) scene->r.ysch*scene->r.yasp;
+
+		if(aspx < aspy) {
+			r_asp[0]= aspx / aspy;
+			r_asp[1]= 1.0;
+		}
+		else {
+			r_asp[0]= 1.0;
+			r_asp[1]= aspy / aspx;
+		}
+	}
+	else {
+		aspx= 1.0f;
+		aspy= 1.0f;
+		r_asp[0]= 1.0f;
+		r_asp[1]= 1.0f;
+	}
+
+	if(camera->type==CAM_ORTHO) {
+		facx= 0.5f * camera->ortho_scale * r_asp[0] * scale[0];
+		facy= 0.5f * camera->ortho_scale * r_asp[1] * scale[1];
+		r_shift[0]= camera->shiftx * camera->ortho_scale * scale[0];
+		r_shift[1]= camera->shifty * camera->ortho_scale * scale[1];
+		depth= do_clip ? -((camera->clipsta * scale[2]) + 0.1f) : - drawsize * camera->ortho_scale * scale[2];
+
+		*r_drawsize= 0.5f * camera->ortho_scale;
+	}
+	else {
+		/* that way it's always visible - clipsta+0.1 */
+		float fac;
+		*r_drawsize= drawsize / ((scale[0] + scale[1] + scale[2]) / 3.0f);
+
+		if(do_clip) {
+			/* fixed depth, variable size (avoids exceeding clipping range) */
+			depth = -(camera->clipsta + 0.1f);
+			fac = depth / (camera->lens/-16.0f * scale[2]);
+		}
+		else {
+			/* fixed size, variable depth (stays a reasonable size in the 3D view) */
+			depth= *r_drawsize * camera->lens/-16.0f * scale[2];
+			fac= *r_drawsize;
+		}
+
+		facx= fac * r_asp[0] * scale[0];
+		facy= fac * r_asp[1] * scale[1];
+		r_shift[0]= camera->shiftx*fac*2 * scale[0];
+		r_shift[1]= camera->shifty*fac*2 * scale[1];
+	}
+
+	r_vec[0][0]= r_shift[0] + facx; r_vec[0][1]= r_shift[1] + facy; r_vec[0][2]= depth;
+	r_vec[1][0]= r_shift[0] + facx; r_vec[1][1]= r_shift[1] - facy; r_vec[1][2]= depth;
+	r_vec[2][0]= r_shift[0] - facx; r_vec[2][1]= r_shift[1] - facy; r_vec[2][2]= depth;
+	r_vec[3][0]= r_shift[0] - facx; r_vec[3][1]= r_shift[1] + facy; r_vec[3][2]= depth;
+}
+
+void camera_view_frame(Scene *scene, Camera *camera, float r_vec[4][3])
+{
+	float dummy_asp[2];
+	float dummy_shift[2];
+	float dummy_drawsize;
+	const float dummy_scale[3]= {1.0f, 1.0f, 1.0f};
+
+	camera_view_frame_ex(scene, camera, FALSE, 1.0, dummy_scale,
+	                     dummy_asp, dummy_shift, &dummy_drawsize, r_vec);
+}
+
 #if 0
 static int pc_findindex(ListBase *listbase, int index)
 {
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index d8ae36b4ab5..1a72405ad5e 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -526,7 +526,7 @@ Scene *add_scene(const char *name)
 	sce->gm.recastData.agentradius = 0.6f;
 	sce->gm.recastData.edgemaxlen = 12.0f;
 	sce->gm.recastData.edgemaxerror = 1.3f;
-	sce->gm.recastData.regionminsize = 50.f;
+	sce->gm.recastData.regionminsize = 8.f;
 	sce->gm.recastData.regionmergesize = 20.f;
 	sce->gm.recastData.vertsperpoly = 6;
 	sce->gm.recastData.detailsampledist = 6.0f;
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 2960d8a41e5..784c67d6d77 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -1744,12 +1744,12 @@ static int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3],
 	GHash *hash;
 	GHashIterator *ihash;
 	float nv1[3], nv2[3], nv3[3], nv4[3], edge1[3], edge2[3],d_nvect[3], dv1[3],ve[3],avel[3]={0.0,0.0,0.0},
-	vv1[3], vv2[3], vv3[3], vv4[3], coledge[3]={0.0f, 0.0f, 0.0f}, mindistedge = 1000.0f,
-	outerforceaccu[3],innerforceaccu[3],
-		facedist,n_mag,force_mag_norm,minx,miny,minz,maxx,maxy,maxz,
-		innerfacethickness = -0.5f, outerfacethickness = 0.2f,
-		ee = 5.0f, ff = 0.1f, fa=1;
-	int a, deflected=0, cavel=0,ci=0;
+	      vv1[3], vv2[3], vv3[3], vv4[3], coledge[3]={0.0f, 0.0f, 0.0f}, mindistedge = 1000.0f,
+	      outerforceaccu[3], innerforceaccu[3],
+	      facedist, /* n_mag, */ /* UNUSED */ force_mag_norm, minx, miny, minz, maxx, maxy, maxz,
+	      innerfacethickness = -0.5f, outerfacethickness = 0.2f,
+	      ee = 5.0f, ff = 0.1f, fa=1;
+	int a, deflected=0, cavel=0, ci=0;
 /* init */
 	*intrusion = 0.0f;
 	hash  = vertexowner->soft->scratch->colliderhash;
@@ -1869,7 +1869,7 @@ static int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3],
 					VECSUB(dv1,opco,nv2); /* abuse dv1 to have vertex in question at *origin* of triangle */
 
 					cross_v3_v3v3(d_nvect, edge2, edge1);
-					n_mag = normalize_v3(d_nvect);
+					/* n_mag = */ /* UNUSED */ normalize_v3(d_nvect);
 					facedist = dot_v3v3(dv1,d_nvect);
 					// so rules are
 					//
@@ -1906,7 +1906,7 @@ static int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3],
 						VECSUB(dv1,opco,nv4); /* abuse dv1 to have vertex in question at *origin* of triangle */
 
 						cross_v3_v3v3(d_nvect, edge2, edge1);
-						n_mag = normalize_v3(d_nvect);
+						/* n_mag = */ /* UNUSED */ normalize_v3(d_nvect);
 						facedist = dot_v3v3(dv1,d_nvect);
 
 						if ((facedist > innerfacethickness) && (facedist < outerfacethickness)){
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 38165182d83..ea6f6eb702b 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -640,7 +640,11 @@ void default_mtex(MTex *mtex)
 	mtex->size[1]= 1.0;
 	mtex->size[2]= 1.0;
 	mtex->tex= NULL;
-	mtex->texflag= MTEX_3TAP_BUMP | MTEX_BUMP_OBJECTSPACE;
+
+	/* MTEX_BUMP_FLIPPED is temporary before 2.61 release to prevent flipping normals
+	   when creating file in 2.60, opening it in 2.59, saving and opening in 2.60 again */
+	mtex->texflag= MTEX_3TAP_BUMP | MTEX_BUMP_OBJECTSPACE | MTEX_BUMP_FLIPPED;
+
 	mtex->colormodel= 0;
 	mtex->r= 1.0;
 	mtex->g= 0.0;