[Bf-blender-cvs] [54a18f6] master: View3D: make ndof turntable & orbit speed match

Campbell Barton noreply at git.blender.org
Thu Oct 22 18:22:44 CEST 2015


Commit: 54a18f6d51db40d0bca7be1f92c8b11f4ff881e4
Author: Campbell Barton
Date:   Fri Oct 23 03:16:21 2015 +1100
Branches: master
https://developer.blender.org/rB54a18f6d51db40d0bca7be1f92c8b11f4ff881e4

View3D: make ndof turntable & orbit speed match

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

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

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

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index aa53362..1fa865b 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -1470,7 +1470,7 @@ static void view3d_ndof_orbit(const struct wmNDOFMotionData *ndof, ScrArea *sa,
 
 		/* Perform the up/down rotation */
 		angle = ndof->dt * rot[0];
-		axis_angle_to_quat(quat, xvec, angle * 2);
+		axis_angle_to_quat(quat, xvec, angle);
 		mul_qt_qtqt(rv3d->viewquat, rv3d->viewquat, quat);
 
 		/* Perform the orbital rotation */
@@ -1482,7 +1482,7 @@ static void view3d_ndof_orbit(const struct wmNDOFMotionData *ndof, ScrArea *sa,
 		rv3d->rot_axis[1] = 0;
 		rv3d->rot_axis[2] = 1;
 
-		axis_angle_to_quat_single(quat, 'Z', angle * 2);
+		axis_angle_to_quat_single(quat, 'Z', angle);
 		mul_qt_qtqt(rv3d->viewquat, rv3d->viewquat, quat);
 
 	}




More information about the Bf-blender-cvs mailing list