diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-12 18:26:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 18:26:28 +0100 |
| commit | 187e3d103944de8713ebec93f90c333d4750710a (patch) | |
| tree | a616096c8b981f4e78603e854a508d1c05cf2932 /scene/resources | |
| parent | 0041efec1dc6e9fc806721196de54bd7dadd97a8 (diff) | |
| parent | b517fc11af4142d69e475de19bcd31b25f904713 (diff) | |
Merge pull request #15629 from endragor/fix-shader-property
Fix Material's shader property binding
Diffstat (limited to 'scene/resources')
| -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 e7329f5183..8a1978cf85 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -178,7 +178,7 @@ void ShaderMaterial::_bind_methods() { 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); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader,ShaderGraph"), "set_shader", "get_shader"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader"), "set_shader", "get_shader"); } void ShaderMaterial::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const { |