From 203f0693296094400db06f826b03cc1d63929223 Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli
Date: Mon, 2 Nov 2015 17:54:33 +0100
Subject: Expose AudioServer::free(RID rid) as AudioServer::free_rid(RID rid)
 to avoid script error due to collision with Object method free

---
 servers/audio_server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'servers/audio_server.cpp')

diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index c155f5204..6c5a2de97 100644
--- a/servers/audio_server.cpp
+++ b/servers/audio_server.cpp
@@ -132,7 +132,7 @@ void AudioServer::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("voice_stop","voice"), &AudioServer::voice_stop );
 
-	ObjectTypeDB::bind_method(_MD("free","rid"), &AudioServer::free );
+	ObjectTypeDB::bind_method(_MD("free_rid","rid"), &AudioServer::free );
 
 	ObjectTypeDB::bind_method(_MD("set_stream_global_volume_scale","scale"), &AudioServer::set_stream_global_volume_scale );
 	ObjectTypeDB::bind_method(_MD("get_stream_global_volume_scale"), &AudioServer::get_stream_global_volume_scale );
-- 
cgit v1.3.1