diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index 1c897201254..942652de47b 100755
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -1429,7 +1429,7 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3]) {
 	if (td->ext) {
 		float fsize[3];
 
-		if (t->flag & T_OBJECT) {
+		if (t->flag & (T_OBJECT|T_TEXTURE)) {
 			float obsizemat[3][3];
 			// Reorient the size mat to fit the oriented object.
 			Mat3MulMat3(obsizemat, tmat, td->axismtx);
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c
index e37cd17028c..40265db6a61 100755
--- a/source/blender/src/transform_conversions.c
+++ b/source/blender/src/transform_conversions.c
@@ -284,6 +284,8 @@ static void createTransTexspace(TransInfo *t)
 	td->ob = ob;
 	
 	Mat3CpyMat4(td->mtx, ob->obmat);
+	Mat3CpyMat4(td->axismtx, ob->obmat);
+	Mat3Ortho(td->axismtx);
 	Mat3Inv(td->smtx, td->mtx);
 	
 	if( GS(id->name)==ID_ME) {