diff options
| author | Duy-Nguyen TA <thduynguyen@gmail.com> | 2018-01-04 11:32:33 -0500 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-04 19:48:05 +0100 |
| commit | 322cb08dd9593f8fd62810104d19367423c69965 (patch) | |
| tree | 7530005b0e61fc3a0e9b8a6a8ff38dd56794de00 /platform/osx | |
| parent | 6e2ed15ff14efe3063f66c182218f56e557bb468 (diff) | |
Fix macOS and other builds after #15299
Commit ammended by @akien-mga to fix more platforms.
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/os_osx.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index a16391c30f..d8dd2eb1db 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1013,7 +1013,7 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a backing:NSBackingStoreBuffered defer:NO]; - ERR_FAIL_COND(window_object == nil, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(window_object == nil, ERR_UNAVAILABLE); window_view = [[GodotContentView alloc] init]; @@ -1100,11 +1100,11 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a #undef ADD_ATTR2 pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes]; - ERR_FAIL_COND(pixelFormat == nil, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(pixelFormat == nil, ERR_UNAVAILABLE); context = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:nil]; - ERR_FAIL_COND(context == nil, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(context == nil, ERR_UNAVAILABLE); [context setView:window_view]; |