diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-29 10:41:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 10:41:22 +0200 |
| commit | bc29f4bca158bbf3a24030cd616f162706e1646c (patch) | |
| tree | bcac4f2ce34607cad2cc1d06337c869c6b1c5321 /platform/linuxbsd/display_server_x11.cpp | |
| parent | b2eb838781f2d2c323c573d4e9ebb3c47d2c6397 (diff) | |
| parent | fd30c36985c6a5de09daf897800c36acb8c2c49a (diff) | |
Merge pull request #47435 from madmiraal/rename-texture-get_data
Rename Texture.get_data() to get_image()
Diffstat (limited to 'platform/linuxbsd/display_server_x11.cpp')
| -rw-r--r-- | platform/linuxbsd/display_server_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp index 27b9d9485a..d6ed416d7c 100644 --- a/platform/linuxbsd/display_server_x11.cpp +++ b/platform/linuxbsd/display_server_x11.cpp @@ -1917,7 +1917,7 @@ void DisplayServerX11::cursor_set_custom_image(const RES &p_cursor, CursorShape Rect2i atlas_rect; if (texture.is_valid()) { - image = texture->get_data(); + image = texture->get_image(); } if (!image.is_valid() && atlas_texture.is_valid()) { @@ -1940,7 +1940,7 @@ void DisplayServerX11::cursor_set_custom_image(const RES &p_cursor, CursorShape ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height); - image = texture->get_data(); + image = texture->get_image(); ERR_FAIL_COND(!image.is_valid()); |