diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-16 23:23:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 23:23:08 +0200 |
| commit | 2cf36651b968e99602445678e1fa6ea0adfc078a (patch) | |
| tree | 5c4dbb878ba35ef895c099621c4224581957fa78 /doc/classes | |
| parent | 97b1e8b5175478d1f09f72aa72f6d98b655f56a4 (diff) | |
| parent | 622a754584d2b9442aee3d5c3835556451225262 (diff) | |
Merge pull request #18814 from PJB3005/18-05-12-imagetexture-load-error
ImageTexture.load returns an error code.
Diffstat (limited to 'doc/classes')
| -rw-r--r-- | doc/classes/Image.xml | 2 | ||||
| -rw-r--r-- | doc/classes/ImageTexture.xml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/classes/Image.xml b/doc/classes/Image.xml index ca2d519e8a..760b0c6bdc 100644 --- a/doc/classes/Image.xml +++ b/doc/classes/Image.xml @@ -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"> diff --git a/doc/classes/ImageTexture.xml b/doc/classes/ImageTexture.xml index 9a5937299c..0bff3317db 100644 --- a/doc/classes/ImageTexture.xml +++ b/doc/classes/ImageTexture.xml @@ -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"> |