[Bf-blender-cvs] [7d90ff08f3f] master: Fix incorrect enum in GHOST test

Campbell Barton noreply at git.blender.org
Sat Feb 15 00:41:19 CET 2020


Commit: 7d90ff08f3f3d4d66c5357b2e9bf00755ca5178f
Author: Campbell Barton
Date:   Sat Feb 15 10:40:05 2020 +1100
Branches: master
https://developer.blender.org/rB7d90ff08f3f3d4d66c5357b2e9bf00755ca5178f

Fix incorrect enum in GHOST test

===================================================================

M	intern/ghost/test/multitest/EventToBuf.c
M	intern/ghost/test/multitest/MultiTest.c

===================================================================

diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c
index 5aee8a50a8d..57fb950fa8b 100644
--- a/intern/ghost/test/multitest/EventToBuf.c
+++ b/intern/ghost/test/multitest/EventToBuf.c
@@ -41,7 +41,7 @@ char *eventtype_to_string(GHOST_TEventType type)
     case GHOST_kEventKeyUp:
       return "KeyUp";
 
-    case GHOST_kEventQuit:
+    case GHOST_kEventQuitRequest:
       return "Quit";
 
     case GHOST_kEventWindowClose:
diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c
index 5c8d3527869..21d706966c1 100644
--- a/intern/ghost/test/multitest/MultiTest.c
+++ b/intern/ghost/test/multitest/MultiTest.c
@@ -736,7 +736,7 @@ static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time)
     mask[y][x / 8] |= (1 << (x % 8));
   }
 
-  GHOST_SetCustomCursorShape(ew->win, bitmap, mask, 16, 16, 0, 0, true);
+  GHOST_SetCustomCursorShape(ew->win, &bitmap[0][0], &mask[0][0], 16, 16, 0, 0, true);
 }
 
 static void extrawindow_handle(void *priv, GHOST_EventHandle evt)
@@ -850,7 +850,7 @@ static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr dat
      * that is, events without a window.
      */
     switch (type) {
-      case GHOST_kEventQuit:
+      case GHOST_kEventQuitRequest:
         app->exit = 1;
         break;



More information about the Bf-blender-cvs mailing list