diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-21 16:48:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 16:48:29 +0100 |
| commit | a77c862b18c283e2795a7bdf665b2d9cc9c3b4d2 (patch) | |
| tree | 29701b02651ef860c1c610ec9145c799767d93b6 /scene/resources/skin.cpp | |
| parent | 0447d6fc8edfd636fa6c859d32e76ec8a760f42e (diff) | |
| parent | 3c0059650da3f1feb3c95364d571fe706826dec6 (diff) | |
Merge pull request #36400 from reduz/variant-string-name
Added StringName as a variant type.
Diffstat (limited to 'scene/resources/skin.cpp')
| -rw-r--r-- | scene/resources/skin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/skin.cpp b/scene/resources/skin.cpp index 28258c0b60..df0620b6c4 100644 --- a/scene/resources/skin.cpp +++ b/scene/resources/skin.cpp @@ -129,7 +129,7 @@ bool Skin::_get(const StringName &p_name, Variant &r_ret) const { void Skin::_get_property_list(List<PropertyInfo> *p_list) const { p_list->push_back(PropertyInfo(Variant::INT, "bind_count", PROPERTY_HINT_RANGE, "0,16384,1,or_greater")); for (int i = 0; i < get_bind_count(); i++) { - p_list->push_back(PropertyInfo(Variant::STRING, "bind/" + itos(i) + "/name", PROPERTY_HINT_RANGE, "0,16384,1,or_greater")); + p_list->push_back(PropertyInfo(Variant::STRING_NAME, "bind/" + itos(i) + "/name")); p_list->push_back(PropertyInfo(Variant::INT, "bind/" + itos(i) + "/bone", PROPERTY_HINT_RANGE, "0,16384,1,or_greater", get_bind_name(i) != StringName() ? PROPERTY_USAGE_NOEDITOR : PROPERTY_USAGE_DEFAULT)); p_list->push_back(PropertyInfo(Variant::TRANSFORM, "bind/" + itos(i) + "/pose")); } |