From 8dc62bbc96cf41540382c70a4f0f9709c332e33e Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Thu, 25 Jan 2018 00:23:31 +0100 Subject: [PATCH] Fix VisualServer.free conflicting with Object.free --- servers/visual_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index faa8c508376..663fce85e90 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));