diff options
| author | Juan Linietsky | 2017-06-28 17:00:18 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-06-28 17:01:35 -0300 |
| commit | db3b05d2893dcaddeb3bcb10b845ff150eb50895 (patch) | |
| tree | e19d761357300ba03360593e3cbdda01e87f215e /scene/resources/material.cpp | |
| parent | 9e54e1f34f7ee0b100b45fa2388f25096eb90670 (diff) | |
| download | godot-db3b05d2893dcaddeb3bcb10b845ff150eb50895.tar.gz godot-db3b05d2893dcaddeb3bcb10b845ff150eb50895.tar.zst godot-db3b05d2893dcaddeb3bcb10b845ff150eb50895.zip | |
Diffstat (limited to 'scene/resources/material.cpp')
| -rw-r--r-- | scene/resources/material.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 0912c7014..393446785 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -49,7 +49,7 @@ Material::~Material() { bool ShaderMaterial::_set(const StringName &p_name, const Variant &p_value) { - if (p_name == SceneStringNames::get_singleton()->shader_shader) { + if (p_name == SceneStringNames::get_singleton()->shader) { set_shader(p_value); return true; } else { @@ -75,7 +75,7 @@ bool ShaderMaterial::_set(const StringName &p_name, const Variant &p_value) { bool ShaderMaterial::_get(const StringName &p_name, Variant &r_ret) const { - if (p_name == SceneStringNames::get_singleton()->shader_shader) { + if (p_name == SceneStringNames::get_singleton()->shader) { r_ret = get_shader(); return true; @@ -97,7 +97,7 @@ bool ShaderMaterial::_get(const StringName &p_name, Variant &r_ret) const { void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const { - p_list->push_back(PropertyInfo(Variant::OBJECT, "shader/shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader,ShaderGraph")); + p_list->push_back(PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader,ShaderGraph")); if (!shader.is_null()) { |