diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2015-11-23 00:22:15 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2015-11-23 00:22:15 +0100 |
| commit | 2674565cf671fefbe894559f325f0fedca8be8b2 (patch) | |
| tree | 928daf2233d6d949846e5456fc620f7c7e7960f3 | |
| parent | d97e8cface8196b8f0be29e11739f0474fad32fc (diff) | |
| parent | 203f0693296094400db06f826b03cc1d63929223 (diff) | |
Merge pull request #1931 from Faless/audio_free_rid
Expose AudioServer::free(RID rid) as AudioServer.free_rid(RID rid)
| -rw-r--r-- | doc/engine_classes.xml | 2 | ||||
| -rw-r--r-- | 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 af153a16ef..43602e26e9 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 c155f5204a..6c5a2de97b 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 ); |