diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-01-24 21:17:13 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 21:17:13 -0300 |
| commit | 94b88c7b0f8c140667824e70602b25ac5c53f61d (patch) | |
| tree | 63fb06bb71636a86bb307a5d368cab30318c63e0 | |
| parent | 70fca42cd91d29da4b0844b5fb84923ea041a75a (diff) | |
| parent | 8dc62bbc96cf41540382c70a4f0f9709c332e33e (diff) | |
Merge pull request #16049 from Zylann/fix_vs_free_rid
Fix VisualServer.free conflicting with Object.free
| -rw-r--r-- | servers/visual_server.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index faa8c50837..663fce85e9 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -1656,7 +1656,7 @@ void VisualServer::_bind_methods() { ClassDB::bind_method(D_METHOD("black_bars_set_margins", "left", "top", "right", "bottom"), &VisualServer::black_bars_set_margins); ClassDB::bind_method(D_METHOD("black_bars_set_images", "left", "top", "right", "bottom"), &VisualServer::black_bars_set_images); - ClassDB::bind_method(D_METHOD("free", "rid"), &VisualServer::free); + ClassDB::bind_method(D_METHOD("free_rid", "rid"), &VisualServer::free); // shouldn't conflict with Object::free() ClassDB::bind_method(D_METHOD("request_frame_drawn_callback", "where", "method", "userdata"), &VisualServer::request_frame_drawn_callback); ClassDB::bind_method(D_METHOD("draw", "swap_buffers"), &VisualServer::draw, DEFVAL(true)); |