As discussed in meeting, fixing Numinput annoyance in transform.

Numpad Minus can now be used all the time to type negative numbers, without interfering with PET.

WARNING Behavior change: PET area of effect is not resized with Alt-Num+ and Alt-Num- (in addition to the scrollwheel)

WARNING testing needed: it's late and the laptop here has a funny emulated numpad, so better be tested on a real keyboard by someone who is not coding past midnight.

2 files changed, 19 insertions, 2 deletions

diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index 9abc5250e49..262465c0308 100755
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -387,8 +387,14 @@ static void transformEvent(unsigned short event, short val) {
 				Trans.redraw= 1;
 			}
 			break;
-		case WHEELDOWNMOUSE:
 		case PADPLUSKEY:
+			if(G.qual & LR_ALTKEY && Trans.flag & T_PROP_EDIT) {
+				Trans.propsize*= 1.1f;
+				calculatePropRatio(&Trans);
+			}
+			Trans.redraw= 1;
+			break;
+		case WHEELDOWNMOUSE:
 			if(Trans.flag & T_PROP_EDIT) {
 				Trans.propsize*= 1.1f;
 				calculatePropRatio(&Trans);
@@ -396,8 +402,14 @@ static void transformEvent(unsigned short event, short val) {
 			else view_editmove(event);
 			Trans.redraw= 1;
 			break;
-		case WHEELUPMOUSE:
 		case PADMINUS:
+			if(G.qual & LR_ALTKEY && Trans.flag & T_PROP_EDIT) {
+				Trans.propsize*= 0.90909090f;
+				calculatePropRatio(&Trans);
+			}
+			Trans.redraw= 1;
+			break;
+		case WHEELUPMOUSE:
 			if(Trans.flag & T_PROP_EDIT) {
 				Trans.propsize*= 0.90909090f;
 				calculatePropRatio(&Trans);
diff --git a/source/blender/src/transform_numinput.c b/source/blender/src/transform_numinput.c
index b070031a7df..a2e9fe475b7 100755
--- a/source/blender/src/transform_numinput.c
+++ b/source/blender/src/transform_numinput.c
@@ -46,6 +46,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BKE_global.h" /* for G */
+
 #include "blendef.h"
 
 #include "mydevice.h"
@@ -176,6 +178,9 @@ char handleNumInput(NumInput *n, unsigned short event)
 			n->ctrl[idx] = -10;
 		}
 		break;
+	case PADMINUS:
+		if(G.qual & LR_ALTKEY)
+			break;
 	case MINUSKEY:
 		if (n->flag & NUM_NO_NEGATIVE)
 			break;