Merge pull request #18814 from PJB3005/18-05-12-imagetexture-load-error
ImageTexture.load returns an error code.
This commit is contained in:
commit
2cf36651b9
4 changed files with 11 additions and 6 deletions
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue