summaryrefslogtreecommitdiff
path: root/doc/classes/Shader.xml
diff options
context:
space:
mode:
authorchris.clst <christophe.claustre.31@gmail.com>2021-11-14 03:23:22 +0100
committerGitHub <noreply@github.com>2021-11-14 03:23:22 +0100
commit038be68649ca60d4a2ffb3c05bdd3cc8ec4841f4 (patch)
tree29dfaacbcab32b7915743a5959f57b05d7816c31 /doc/classes/Shader.xml
parentcc39ba5509263346f33894be3a2c84580c1168a9 (diff)
parented300d7be536b1ec325ba77521eceee73dd0e5fb (diff)
Merge branch 'godotengine:master' into bugfix_shader_compile_spirv_from_source
Diffstat (limited to 'doc/classes/Shader.xml')
-rw-r--r--doc/classes/Shader.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/classes/Shader.xml b/doc/classes/Shader.xml
index 99e38e969d..751afb9b65 100644
--- a/doc/classes/Shader.xml
+++ b/doc/classes/Shader.xml
@@ -13,9 +13,11 @@
<method name="get_default_texture_param" qualifiers="const">
<return type="Texture2D" />
<argument index="0" name="param" type="StringName" />
+ <argument index="1" name="index" type="int" default="0" />
<description>
Returns the texture that is set as default for the specified parameter.
[b]Note:[/b] [code]param[/code] must match the name of the uniform in the code exactly.
+ [b]Note:[/b] If the sampler array is used use [code]index[/code] to access the specified texture.
</description>
</method>
<method name="get_mode" qualifiers="const">
@@ -36,9 +38,11 @@
<return type="void" />
<argument index="0" name="param" type="StringName" />
<argument index="1" name="texture" type="Texture2D" />
+ <argument index="2" name="index" type="int" default="0" />
<description>
Sets the default texture to be used with a texture uniform. The default is used if a texture is not set in the [ShaderMaterial].
[b]Note:[/b] [code]param[/code] must match the name of the uniform in the code exactly.
+ [b]Note:[/b] If the sampler array is used use [code]index[/code] to access the specified texture.
</description>
</method>
</methods>