[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38675] branches/merwin-spacenav/source/ blender/editors/space_view3d/view3d_edit.c: invert axes option affects trackball navigation

[Mike Erwin]

Revision: 38675
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38675
Author:   merwin
Date:     2011-07-25 03:13:15 +0000 (Mon, 25 Jul 2011)
Log Message:
-----------
invert axes option affects trackball navigation

Modified Paths:
--------------
    branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c

Modified: branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c	2011-07-25 01:44:19 UTC (rev 38674)
+++ branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c	2011-07-25 03:13:15 UTC (rev 38675)
@@ -1029,9 +1029,12 @@
 			float view_inv[4], view_inv_conj[4];
 
 			ndof_to_quat(ndof, rot);
-			// mul_qt_fl(rot, rot_sensitivity * (invert ? -1.f : 1.f));
+			// mul_qt_fl(rot, rot_sensitivity);
 			// ^^ no apparent effect
 
+			if (invert)
+				invert_qt(rot);
+
 			invert_qt_qt(view_inv, rv3d->viewquat);
 			copy_qt_qt(view_inv_conj, view_inv);
 			conjugate_qt(view_inv_conj);
@@ -1040,10 +1043,6 @@
 			mul_qt_qtqt(rot, view_inv, rot);
 			mul_qt_qtqt(rot, rot, view_inv_conj);
 
-			// if (invert)
-			//	invert_qt(rot);
-			// ^^ argh!! this does something crazy
-
 			// apply rotation
 			mul_qt_qtqt(rv3d->viewquat, rv3d->viewquat, rot);