Merged changes in the trunk up to revision 42425.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c

4 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 8b8ae95631c..fcc285d52f0 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -130,7 +130,7 @@ typedef struct TransDataExtension {
 	// float drotAngle;	 /* Initial object drotAngle,    TODO: not yet implimented */
 	// float drotAxis[3];	 /* Initial object drotAxis, TODO: not yet implimented */
 	float dquat[4];		 /* Initial object dquat */
-	float dsize[3];		 /* Initial object dsize */
+	float dscale[3];     /* Initial object dscale */
 	float *rot;          /* Rotation of the data to transform (Faculative)                                 */
 	float  irot[3];      /* Initial rotation                                                               */
 	float *quat;         /* Rotation quaternion of the data to transform (Faculative)                      */
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index e19c115b194..5527ab0d331 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -4314,7 +4314,7 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
 
 	td->ext->size = ob->size;
 	copy_v3_v3(td->ext->isize, ob->size);
-	copy_v3_v3(td->ext->dsize, ob->dsize);
+	copy_v3_v3(td->ext->dscale, ob->dscale);
 
 	copy_v3_v3(td->center, ob->obmat[3]);
 
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 72f10a532d7..d0857958a4b 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1552,7 +1552,7 @@ void calculateCenter(TransInfo *t)
 			if(t->obedit->type == OB_MESH) {
 				EditSelection ese;
 				EditMesh *em = BKE_mesh_get_editmesh(t->obedit->data);
-			
+
 				if (EM_get_actSelection(em, &ese)) {
 					EM_editselection_center(t->center, &ese);
 					calculateCenter2D(t);
@@ -1570,7 +1570,7 @@ void calculateCenter(TransInfo *t)
 				}
 			}
 		} /* END EDIT MODE ACTIVE ELEMENT */
-		
+
 		calculateCenterMedian(t);
 		if((t->flag & (T_EDIT|T_POSE))==0)
 		{
diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c
index 3de68a6e312..a4f03e76fd1 100644
--- a/source/blender/editors/transform/transform_input.c
+++ b/source/blender/editors/transform/transform_input.c
@@ -189,16 +189,16 @@ void setCustomPoints(TransInfo *UNUSED(t), MouseInput *mi, int start[2], int end
 
 static void InputCustomRatio(TransInfo *UNUSED(t), MouseInput *mi, const int mval[2], float output[3])
 {
-	float length;
-	float distance;
+	double length;
+	double distance;
+	double dx, dy;
 	int *data = mi->data;
-	int dx, dy;
 	
 	if (data) {
 		dx = data[2] - data[0];
 		dy = data[3] - data[1];
 		
-		length = (float)sqrtf(dx*dx + dy*dy);
+		length = sqrt(dx*dx + dy*dy);
 		
 		if (mi->precision) {
 			/* deal with Shift key by adding motion / 10 to motion before shift press */
@@ -216,7 +216,7 @@ static void InputCustomRatio(TransInfo *UNUSED(t), MouseInput *mi, const int mva
 			distance = (length != 0.0f)? (mdx*dx + mdy*dy) / length: 0.0f;
 		}
 
-		output[0] = (length != 0.0f)? distance / length: 0.0f;
+		output[0] = (float)((length != 0.0f)? distance / length: 0.0f);
 	}
 }