[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55583] trunk/blender/source/blender/ editors/space_view3d: edit to VIEW3D_OT_view_center_pick

[Campbell Barton]

Revision: 55583
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55583
Author:   campbellbarton
Date:     2013-03-26 01:43:00 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
edit to VIEW3D_OT_view_center_pick
- pan when nothing is under the mouse
- use key binding alt+f

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/editors/space_view3d/view3d_ops.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2013-03-26 01:16:58 UTC (rev 55582)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2013-03-26 01:43:00 UTC (rev 55583)
@@ -2678,9 +2678,15 @@
 		view3d_operator_needs_opengl(C);
 
 		if (ED_view3d_autodist(scene, ar, v3d, event->mval, new_ofs, false)) {
-			negate_v3(new_ofs);
-			view3d_smooth_view(C, v3d, ar, NULL, NULL, new_ofs, NULL, NULL, NULL);
+			/* pass */
 		}
+		else {
+			/* fallback to simple pan */
+			negate_v3_v3(new_ofs, rv3d->ofs);
+			view3d_get_view_aligned_coordinate(ar, new_ofs, event->mval, true);
+		}
+		negate_v3(new_ofs);
+		view3d_smooth_view(C, v3d, ar, NULL, NULL, new_ofs, NULL, NULL, NULL);
 	}
 
 	return OPERATOR_FINISHED;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ops.c	2013-03-26 01:16:58 UTC (rev 55582)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ops.c	2013-03-26 01:43:00 UTC (rev 55583)
@@ -246,7 +246,7 @@
 	WM_keymap_add_item(keymap, "VIEW3D_OT_view_center_camera", HOMEKEY, KM_PRESS, 0, 0); /* only with camera view */
 
 	WM_keymap_add_item(keymap, "VIEW3D_OT_view_center_cursor", HOMEKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "VIEW3D_OT_view_center_pick", FKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "VIEW3D_OT_view_center_pick", FKEY, KM_PRESS, KM_ALT, 0);
 
 	kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
 	RNA_boolean_set(kmi->ptr, "center", FALSE); /* only without camera view */