update to trunk r14199ndof

1 files changed, 30 insertions, 8 deletions

diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index d846ba2c197..5838a09e160 100644
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -467,7 +467,7 @@ static void viewRedrawPost(TransInfo *t)
 
 void BIF_selectOrientation() {
 	short val;
-	char *str_menu = BIF_menustringTransformOrientation();
+	char *str_menu = BIF_menustringTransformOrientation("Orientation");
 	val= pupmenu(str_menu);
 	MEM_freeN(str_menu);
 	
@@ -1288,21 +1288,43 @@ void ManipulatorTransform()
 			}
 			if(val) {
 				switch(event) {
-				case WHEELDOWNMOUSE:
 				case PADPLUSKEY:
-					if(Trans.flag & T_PROP_EDIT) {
+					if(G.qual & LR_ALTKEY && Trans.flag & T_PROP_EDIT) {
 						Trans.propsize*= 1.1f;
 						calculatePropRatio(&Trans);
-						Trans.redraw= 1;
 					}
+					Trans.redraw= 1;
+					break;
+				case PAGEUPKEY:
+				case WHEELDOWNMOUSE:
+					if (Trans.flag & T_AUTOIK) {
+						transform_autoik_update(&Trans, 1);
+					}
+					else if(Trans.flag & T_PROP_EDIT) {
+						Trans.propsize*= 1.1f;
+						calculatePropRatio(&Trans);
+					}
+					else view_editmove(event);
+					Trans.redraw= 1;
 					break;
-				case WHEELUPMOUSE:
 				case PADMINUS:
-					if(Trans.flag & T_PROP_EDIT) {
+					if(G.qual & LR_ALTKEY && Trans.flag & T_PROP_EDIT) {
+						Trans.propsize*= 0.90909090f;
+						calculatePropRatio(&Trans);
+					}
+					Trans.redraw= 1;
+					break;
+				case PAGEDOWNKEY:
+				case WHEELUPMOUSE:
+					if (Trans.flag & T_AUTOIK) {
+						transform_autoik_update(&Trans, -1);
+					}
+					else if (Trans.flag & T_PROP_EDIT) {
 						Trans.propsize*= 0.90909090f;
 						calculatePropRatio(&Trans);
-						Trans.redraw= 1;
 					}
+					else view_editmove(event);
+					Trans.redraw= 1;
 					break;
 				}
 							
@@ -2126,7 +2148,7 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3]) {
 
 	VecMulf(vec, td->factor);
 
-	if (t->flag & T_OBJECT) {
+	if (t->flag & (T_OBJECT|T_POSE)) {
 		Mat3MulVecfl(td->smtx, vec);
 	}