Mercurial > ldforge / file diff

--- a/gui.cpp	Mon Apr 22 17:15:25 2013 +0300
+++ b/gui.cpp	Mon Apr 22 17:46:09 2013 +0300
@@ -80,6 +80,7 @@
 EXTERN_ACTION (gridCoarse)
 EXTERN_ACTION (gridMedium)
 EXTERN_ACTION (gridFine)
+EXTERN_ACTION (resetView)
 
 #ifndef RELEASE
 EXTERN_ACTION (addTestQuad)
@@ -190,6 +191,10 @@
 	qFileMenu->addSeparator ();								// -------
 	qFileMenu->addAction (ACTION_NAME (exit));				// Exit
 	
+	// View menu
+	qViewMenu = menuBar ()->addMenu (tr ("&View"));
+	qViewMenu->addAction (ACTION_NAME (resetView));
+	
 	// Insert menu
 	qInsertMenu = menuBar ()->addMenu (tr ("&Insert"));
 	qInsertMenu->addAction (ACTION_NAME (newSubfile));		// New Subfile
@@ -692,7 +697,7 @@
 	
 	// Update the shared selection array, unless this was called during GL picking,
 	// in which case the GL renderer takes care of the selection.
-	if (R->bPicking == false) {
+	if (R->picking == false) {
 		std::vector<LDObject*> paPriorSelection = paSelection;
 		paSelection = getSelectedObjects ();