diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-18 22:01:57 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 22:01:57 -0300 |
| commit | 34016a8b738c36b214fb79d66ba546aabab72e9e (patch) | |
| tree | 82dc23a3a20462cc8862f2a238f0a7d489325ea1 | |
| parent | ca14dd296a9ce9f39cefe378fda5e127375970f4 (diff) | |
| parent | 81d9fe44df817f390e05592c25e5634973494d0e (diff) | |
Merge pull request #7577 from tagcup/issue_7476
Use property convention introduced in b085c4 (_ rather than / as sepa…
| -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 112ecaae2f..e2e79970f9 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -732,7 +732,7 @@ Ref<Texture> FixedSpatialMaterial::get_texture(TextureParam p_param) const { void FixedSpatialMaterial::_validate_feature(const String& text, Feature feature,PropertyInfo& property) const { - if (property.name.begins_with(text) && property.name!=text+"/enabled" && !features[feature]) { + if (property.name.begins_with(text) && property.name!=text+"_enabled" && !features[feature]) { property.usage=0; } |