Merge pull request #18814 from PJB3005/18-05-12-imagetexture-load-error

ImageTexture.load returns an error code.
This commit is contained in:
Rémi Verschelde 2018-05-16 23:23:08 +02:00 committed by GitHub
commit 2cf36651b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions

View file

@ -338,6 +338,7 @@
<argument index="0" name="buffer" type="PoolByteArray">
</argument>
<description>
Loads an image from the binary contents of a JPEG file.
</description>
</method>
<method name="load_png_from_buffer">
@ -346,6 +347,7 @@
<argument index="0" name="buffer" type="PoolByteArray">
</argument>
<description>
Loads an image from the binary contents of a PNG file.
</description>
</method>
<method name="lock">

View file

@ -47,12 +47,12 @@
</description>
</method>
<method name="load">
<return type="void">
<return type="int" enum="Error">
</return>
<argument index="0" name="path" type="String">
</argument>
<description>
Load an [code]ImageTexture[/code].
Load an [code]ImageTexture[/code] from a file path.
</description>
</method>
<method name="set_data">