godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3627 from lordadamson/master 

renamed function get_video_texutre to get_video_texture
This commit is contained in:
Rémi Verschelde 2016-02-08 11:21:58 +01:00
parent 84fbe2d4cb 6be6d02daf
commit f5433dc60d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/base/classes.xml
View File

@ -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>

2
scene/gui/video_player.cpp
View File

@ -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") );