diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-11 16:44:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-11 16:44:21 +0200 |
| commit | b708546f50f82672caf79fcf5561b21801a5f103 (patch) | |
| tree | 649829c8b72e629b5914afc01faf4cae835411c5 /scene/resources/material.cpp | |
| parent | 9f0a65b804da903b0c7ebdaffd80dee01acbdc28 (diff) | |
| parent | 074801e7a9078c45e281787bc6e856747a957b23 (diff) | |
Merge pull request #9602 from ducdetronquito/master
[#7212] Fixed missing 'Variant' return values in documentation.
Diffstat (limited to 'scene/resources/material.cpp')
| -rw-r--r-- | scene/resources/material.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 705702b8be..a0b192259b 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -163,7 +163,7 @@ void ShaderMaterial::_bind_methods() { ClassDB::bind_method(D_METHOD("set_shader", "shader:Shader"), &ShaderMaterial::set_shader); ClassDB::bind_method(D_METHOD("get_shader:Shader"), &ShaderMaterial::get_shader); ClassDB::bind_method(D_METHOD("set_shader_param", "param", "value"), &ShaderMaterial::set_shader_param); - ClassDB::bind_method(D_METHOD("get_shader_param", "param"), &ShaderMaterial::get_shader_param); + ClassDB::bind_method(D_METHOD("get_shader_param:Variant", "param"), &ShaderMaterial::get_shader_param); } void ShaderMaterial::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const { |