[Bf-blender-cvs] [92755da] master: Fix T44251 (2nd try): Changing views using numpad broken

[Julian Eisel]

Commit: 92755da4712a68ed62857a1c00eb8b43916d07b6
Author: Julian Eisel
Date:   Sun Apr 5 15:41:20 2015 +0200
Branches: master
https://developer.blender.org/rB92755da4712a68ed62857a1c00eb8b43916d07b6

Fix T44251 (2nd try): Changing views using numpad broken

===================================================================

M	source/blender/editors/space_view3d/view3d_ops.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index c5425f2..6ba3a28 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -236,7 +236,8 @@ void view3d_keymap(wmKeyConfig *keyconf)
 
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_navigate", FKEY, KM_PRESS, KM_SHIFT, 0);
 
-	WM_keymap_verify_item(keymap, "VIEW3D_OT_smoothview", TIMER1, KM_ANY, KM_ANY, 0);
+	/* value is set to KM_NOTHING to avoid conflicts with click type (see T44251) */
+	WM_keymap_verify_item(keymap, "VIEW3D_OT_smoothview", TIMER1, KM_NOTHING, KM_ANY, 0);
 	
 	WM_keymap_add_item(keymap, "VIEW3D_OT_rotate", MOUSEPAN, 0, 0, 0);
 	WM_keymap_add_item(keymap, "VIEW3D_OT_rotate", MOUSEROTATE, 0, 0, 0);