diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2015-11-02 17:54:33 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2015-11-02 17:54:33 +0100 |
| commit | 203f0693296094400db06f826b03cc1d63929223 (patch) | |
| tree | fec9ae36d13c1dfe97a3a0fd5ef3db34e4786737 | |
| parent | b2f9acb8c96aed0505cbac21661e21e4acef710f (diff) | |
Expose AudioServer::free(RID rid) as AudioServer::free_rid(RID rid)
to avoid script error due to collision with Object method free
| -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 ); |