Merge branch 'master' into codesign_error_tracker

1 files changed, 7 insertions, 5 deletions

diff --git a/intern/ghost/intern/GHOST_EventTrackpad.h b/intern/ghost/intern/GHOST_EventTrackpad.h
index a22f8a34fad..d4f9d0f2b55 100644
--- a/intern/ghost/intern/GHOST_EventTrackpad.h
+++ b/intern/ghost/intern/GHOST_EventTrackpad.h
@@ -33,11 +33,11 @@ class GHOST_EventTrackpad : public GHOST_Event {
  public:
   /**
    * Constructor.
-   * \param msec      The time this event was generated.
+   * \param msec: The time this event was generated.
    * \param window: The window of this event.
-   * \param subtype   The subtype of the event.
-   * \param x         The x-delta of the pan event.
-   * \param y         The y-delta of the pan event.
+   * \param subtype: The subtype of the event.
+   * \param x: The x-delta of the pan event.
+   * \param y: The y-delta of the pan event.
    */
   GHOST_EventTrackpad(GHOST_TUns64 msec,
                       GHOST_IWindow *window,
@@ -45,7 +45,8 @@ class GHOST_EventTrackpad : public GHOST_Event {
                       GHOST_TInt32 x,
                       GHOST_TInt32 y,
                       GHOST_TInt32 deltaX,
-                      GHOST_TInt32 deltaY)
+                      GHOST_TInt32 deltaY,
+                      bool isDirectionInverted)
       : GHOST_Event(msec, GHOST_kEventTrackpad, window)
   {
     m_trackpadEventData.subtype = subtype;
@@ -53,6 +54,7 @@ class GHOST_EventTrackpad : public GHOST_Event {
     m_trackpadEventData.y = y;
     m_trackpadEventData.deltaX = deltaX;
     m_trackpadEventData.deltaY = deltaY;
+    m_trackpadEventData.isDirectionInverted = isDirectionInverted;
     m_data = &m_trackpadEventData;
   }