diff options
author | Dalai Felinto <dalai@blender.org> | 2020-10-30 12:52:25 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-10-30 12:52:25 +0300 |
commit | ff73dc244cfffaa279062afbf7f52d7873289f1f (patch) | |
tree | 45c13b48c9482fb36797cd1df076000d576271b1 | |
parent | 8bdf191461a6a09c71258e69246d13fa3034e357 (diff) | |
parent | 9e85812acc88fa469aecccb1d5ed3e28e362278a (diff) |
Merge remote-tracking branch 'origin/blender-v2.91-release'
-rw-r--r-- | intern/cycles/bvh/bvh.cpp | 1 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp index 2a1114229da..222c1c40f92 100644 --- a/intern/cycles/bvh/bvh.cpp +++ b/intern/cycles/bvh/bvh.cpp @@ -108,6 +108,7 @@ BVH *BVH::create(const BVHParams ¶ms, #ifdef WITH_EMBREE return new BVHEmbree(params, geometry, objects, device); #else + (void)device; break; #endif case BVH_LAYOUT_OPTIX: diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index c22651e2752..152dae48905 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1589,7 +1589,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) } case GHOST_kGrabWrap: // Wrap cursor at area/window boundaries { - NSPoint mousePos = [cocoawindow mouseLocationOutsideOfEventStream]; + NSPoint mousePos = [event locationInWindow]; GHOST_TInt32 x_mouse = mousePos.x; GHOST_TInt32 y_mouse = mousePos.y; GHOST_Rect bounds, windowBounds, correctedBounds; @@ -1639,7 +1639,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) } default: { // Normal cursor operation: send mouse position in window - NSPoint mousePos = [cocoawindow mouseLocationOutsideOfEventStream]; + NSPoint mousePos = [event locationInWindow]; GHOST_TInt32 x, y; window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); @@ -1699,7 +1699,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) pushEvent(new GHOST_EventWheel([event timestamp] * 1000, window, delta)); } else { - NSPoint mousePos = [cocoawindow mouseLocationOutsideOfEventStream]; + NSPoint mousePos = [event locationInWindow]; GHOST_TInt32 x, y; double dx; double dy; @@ -1722,7 +1722,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) } break; case NSEventTypeMagnify: { - NSPoint mousePos = [cocoawindow mouseLocationOutsideOfEventStream]; + NSPoint mousePos = [event locationInWindow]; GHOST_TInt32 x, y; window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); pushEvent(new GHOST_EventTrackpad([event timestamp] * 1000, @@ -1735,7 +1735,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) } break; case NSEventTypeSmartMagnify: { - NSPoint mousePos = [cocoawindow mouseLocationOutsideOfEventStream]; + NSPoint mousePos = [event locationInWindow]; GHOST_TInt32 x, y; window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); pushEvent(new GHOST_EventTrackpad( @@ -1743,7 +1743,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) } break; case NSEventTypeRotate: { - NSPoint mousePos = [cocoawindow mouseLocationOutsideOfEventStream]; + NSPoint mousePos = [event locationInWindow]; GHOST_TInt32 x, y; window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); pushEvent(new GHOST_EventTrackpad([event timestamp] * 1000, |