diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-28 16:00:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 16:00:21 +0200 |
| commit | fac0120521f1bf37dc7a8b86e67eb0754baee931 (patch) | |
| tree | 972cb7473c3ac29c3702dca73b3a1180e34d5e13 /platform/osx/os_osx.mm | |
| parent | 4c5dd51eb9253478bfb5b106ea22a24f5b55133c (diff) | |
| parent | c8e0ec0580b16460372ae59a17b1b824eb5df4f1 (diff) | |
| download | redot-engine-fac0120521f1bf37dc7a8b86e67eb0754baee931.tar.gz | |
Merge pull request #19218 from guilhermefelipecgs/fix_invalid_image2
Change position of validation in set_custom_mouse_cursor
Diffstat (limited to 'platform/osx/os_osx.mm')
| -rw-r--r-- | platform/osx/os_osx.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index a04783d2ca..a49ae1a2f3 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1543,10 +1543,11 @@ void OS_OSX::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); - ERR_FAIL_COND(!image.is_valid()); image = texture->get_data(); + ERR_FAIL_COND(!image.is_valid()); + NSBitmapImageRep *imgrep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:int(texture_size.width) |