Merging r39135 through r39172 from trunk into soc-2011-tomato
[blender.git] / source / blender / windowmanager / WM_types.h
index a489845881f918763f89ec861e3f9813f7977c42..830ccfa7d1c7337df676a94f681f10d148bc524d 100644 (file)
@@ -391,8 +391,14 @@ 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.
-       float tvec[3]; // translation
-       float rvec[3]; // rotation:
+       union {
+               float tvec[3]; // translation
+               struct { float tx, ty, tz; };
+               };
+       union {
+               float rvec[3]; // rotation:
+               struct { float rx, ry, rz; };
+               };
                // axis = (rx,ry,rz).normalized
                // amount = (rx,ry,rz).magnitude [in revolutions, 1.0 = 360 deg]
        float dt; // time since previous NDOF Motion event