diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-12 22:30:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 22:30:43 +0200 |
| commit | 88463c3eee630ba780556918294744ba7125c94b (patch) | |
| tree | 3116fc88200f7e8174d841aed3455eb894cff744 /platform | |
| parent | 64ec08d70d9cec506df11b04541822ae1bd66a60 (diff) | |
| parent | 033dc4dbefed22aab7b58a60e27ce3c86943fe25 (diff) | |
Merge pull request #53712 from CakHuri/nullptr
Replace NULL with nullptr
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/display_server_osx.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index da6c45793a..3fe055a511 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -3014,7 +3014,7 @@ void DisplayServerOSX::cursor_set_custom_image(const RES &p_cursor, CursorShape ERR_FAIL_COND(!image.is_valid()); NSBitmapImageRep *imgrep = [[NSBitmapImageRep alloc] - initWithBitmapDataPlanes:NULL + initWithBitmapDataPlanes:nullptr pixelsWide:int(texture_size.width) pixelsHigh:int(texture_size.height) bitsPerSample:8 @@ -3418,7 +3418,7 @@ void DisplayServerOSX::set_icon(const Ref<Image> &p_icon) { img = img->duplicate(); img->convert(Image::FORMAT_RGBA8); NSBitmapImageRep *imgrep = [[NSBitmapImageRep alloc] - initWithBitmapDataPlanes:NULL + initWithBitmapDataPlanes:nullptr pixelsWide:img->get_width() pixelsHigh:img->get_height() bitsPerSample:8 |