From 203f0693296094400db06f826b03cc1d63929223 Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Mon, 2 Nov 2015 17:54:33 +0100
Subject: [PATCH] Expose AudioServer::free(RID rid) as
 AudioServer::free_rid(RID rid) to avoid script error due to collision with
 Object method free

---
 doc/engine_classes.xml   | 2 +-
 servers/audio_server.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/engine_classes.xml b/doc/engine_classes.xml
index af153a16ef5..43602e26e97 100644
--- a/doc/engine_classes.xml
+++ b/doc/engine_classes.xml
@@ -1502,7 +1502,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="free">
+		<method name="free_rid">
 			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index c155f5204ae..6c5a2de97b7 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 );