diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-02-18 16:51:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-18 16:55:58 +0400 |
commit | dcdb4eaf9cce1f3ff84bbe221ebafd20c2371541 (patch) | |
tree | 794f2700130434d78435166532f0b813e0a0b3f7 /source/blender/windowmanager/WM_types.h | |
parent | 13553876ba3e18f49c2199d9c21f53ff2d8b2e41 (diff) |
NDOF: Fix for fly/walk mode ignoring axis invert options
Diffstat (limited to 'source/blender/windowmanager/WM_types.h')
-rw-r--r-- | source/blender/windowmanager/WM_types.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 8bbdd7bd736..c93ed89d78f 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -481,14 +481,8 @@ typedef struct wmNDOFMotionData { /* awfully similar to GHOST_TEventNDOFMotionData... */ /* Each component normally ranges from -1 to +1, but can exceed that. * These use blender standard view coordinates, with positive rotations being CCW about the axis. */ - union { - float tvec[3]; /* translation */ - struct { float tx, ty, tz; }; - }; - union { - float rvec[3]; /* rotation: */ - struct { float rx, ry, rz; }; - }; + float tvec[3]; /* translation */ + float rvec[3]; /* rotation: */ /* axis = (rx,ry,rz).normalized */ /* amount = (rx,ry,rz).magnitude [in revolutions, 1.0 = 360 deg] */ float dt; /* time since previous NDOF Motion event */ |