Browse Source

Merge pull request #16049 from Zylann/fix_vs_free_rid

Fix VisualServer.free conflicting with Object.free
Juan Linietsky 7 years ago
parent
commit
94b88c7b0f
1 changed files with 1 additions and 1 deletions
  1. 1 1
      servers/visual_server.cpp

+ 1 - 1
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));