Merge pull request #16049 from Zylann/fix_vs_free_rid

Fix VisualServer.free conflicting with Object.free
godotengine · Jan 25, 2018 · 94b88c7 · 94b88c7
2 parents 70fca42 + 8dc62bb
commit 94b88c7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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));