[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38646] branches/merwin-spacenav/source/ blender/windowmanager/intern/wm_event_system.c: ndof overall sensitivity is now live

[Mike Erwin]

Revision: 38646
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38646
Author:   merwin
Date:     2011-07-24 00:40:39 +0000 (Sun, 24 Jul 2011)
Log Message:
-----------
ndof overall sensitivity is now live

Modified Paths:
--------------
    branches/merwin-spacenav/source/blender/windowmanager/intern/wm_event_system.c

Modified: branches/merwin-spacenav/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- branches/merwin-spacenav/source/blender/windowmanager/intern/wm_event_system.c	2011-07-23 22:08:37 UTC (rev 38645)
+++ branches/merwin-spacenav/source/blender/windowmanager/intern/wm_event_system.c	2011-07-24 00:40:39 UTC (rev 38646)
@@ -2314,14 +2314,16 @@
 {
 	wmNDOFMotionData* data = MEM_mallocN(sizeof(wmNDOFMotionData), "customdata NDOF");
 
-	data->tx = ghost->tx;
-	data->ty = ghost->ty;
-	data->tz = ghost->tz;
+	const float s = U.ndof_sensitivity;
 
-	data->rx = ghost->rx;
-	data->ry = ghost->ry;
-	data->rz = ghost->rz;
+	data->tx = s * ghost->tx;
+	data->ty = s * ghost->ty;
+	data->tz = s * ghost->tz;
 
+	data->rx = s * ghost->rx;
+	data->ry = s * ghost->ry;
+	data->rz = s * ghost->rz;
+
 	data->dt = ghost->dt;
 
 	data->progress = (wmProgress) ghost->progress;