stricter NDOF guards for Windows (forgot in earlier commit)

1 files changed, 7 insertions, 5 deletions

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 0dac0bd7401..258d6bbc025 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2330,26 +2330,28 @@ static void attach_ndof_data(wmEvent* event, const GHOST_TEventNDOFMotionData* g
 	const float s = U.ndof_sensitivity;
 
 	data->tvec[0]= s * ghost->tx;
+
 	data->rvec[0]= s * ghost->rx;
+	data->rvec[1]= s * ghost->ry;
+	data->rvec[2]= s * ghost->rz;
 
 	if (U.ndof_flag & NDOF_ZOOM_UPDOWN)
 		{
-		// swap Y and Z
+		// rotate so Y is where Z was (maintain handed-ness)
 		data->tvec[1]= s * ghost->tz;
-		data->tvec[2]= s * ghost->ty;
+		data->tvec[2]= s * -ghost->ty;
 
 		// should this affect rotation also?
 		// initial guess is 'yes', but get user feedback immediately!
+#if 0	// after turning this on, my guess becomes 'no'
 		data->rvec[1]= s * ghost->rz;
 		data->rvec[2]= s * ghost->ry;
+#endif
 		}
 	else
 		{
 		data->tvec[1]= s * ghost->ty;
 		data->tvec[2]= s * ghost->tz;
-
-		data->rvec[1]= s * ghost->ry;
-		data->rvec[2]= s * ghost->rz;
 		}
 
 	data->dt = ghost->dt;