diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-02-08 11:21:58 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-02-08 11:21:58 +0100 |
| commit | f5433dc60d4a2e56b64f0a581ccb82c71e0887ee (patch) | |
| tree | ddb227de97e6b81235d373fa58f88089dd977865 | |
| parent | 84fbe2d4cbdce9d92e9a835df5926cf0795d089f (diff) | |
| parent | 6be6d02daf8d264229d1328330270a834f8c2916 (diff) | |
| download | redot-engine-f5433dc60d4a2e56b64f0a581ccb82c71e0887ee.tar.gz | |
Merge pull request #3627 from lordadamson/master
renamed function get_video_texutre to get_video_texture
| -rw-r--r-- | doc/base/classes.xml | 2 | ||||
| -rw-r--r-- | scene/gui/video_player.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 1defac1cda..b1871632d0 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -39335,7 +39335,7 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> - <method name="get_video_texutre"> + <method name="get_video_texture"> <return type="Texture"> </return> <description> diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp index 517cd414c5..fc7cc0a362 100644 --- a/scene/gui/video_player.cpp +++ b/scene/gui/video_player.cpp @@ -393,7 +393,7 @@ void VideoPlayer::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_buffering_msec","msec"),&VideoPlayer::set_buffering_msec); ObjectTypeDB::bind_method(_MD("get_buffering_msec"),&VideoPlayer::get_buffering_msec); - ObjectTypeDB::bind_method(_MD("get_video_texutre:Texture"), &VideoPlayer::get_video_texture ); + ObjectTypeDB::bind_method(_MD("get_video_texture:Texture"), &VideoPlayer::get_video_texture ); ADD_PROPERTY( PropertyInfo(Variant::INT, "stream/audio_track",PROPERTY_HINT_RANGE,"0,128,1"), _SCS("set_audio_track"), _SCS("get_audio_track") ); ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"VideoStream"), _SCS("set_stream"), _SCS("get_stream") ); |