godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AnimationMultiTrackKeyEdit Allow editing easing if it's possible for all edited tracks

Browse Source 
(cherry picked from commit 1d890e16f7)
This commit is contained in:
kleonc 2021-06-17 23:28:04 +02:00 committed by Rémi Verschelde
parent 59d72279ae
commit 4ae0310cec
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
editor/animation_track_editor.cpp
View File

@ -1175,31 +1175,29 @@ public:
p_list->push_back(PropertyInfo(Variant::VECTOR3, "scale")); p_list->push_back(PropertyInfo(Variant::VECTOR3, "scale"));
} break; } break;
case Animation::TYPE_VALUE: { case Animation::TYPE_VALUE: {
if (!same_key_type) { if (same_key_type) {
break; Variant v = animation->track_get_key_value(first_track, first_key);
}
Variant v = animation->track_get_key_value(first_track, first_key); if (hint.type != Variant::NIL) {
PropertyInfo pi = hint;
pi.name = "value";
p_list->push_back(pi);
} else {
PropertyHint hint = PROPERTY_HINT_NONE;
String hint_string;
if (hint.type != Variant::NIL) { if (v.get_type() == Variant::OBJECT) {
PropertyInfo pi = hint; //could actually check the object property if exists..? yes i will!
pi.name = "value"; Ref<Resource> res = v;
p_list->push_back(pi); if (res.is_valid()) {
} else { hint = PROPERTY_HINT_RESOURCE_TYPE;
PropertyHint hint = PROPERTY_HINT_NONE; hint_string = res->get_class();
String hint_string; }
if (v.get_type() == Variant::OBJECT) {
//could actually check the object property if exists..? yes i will!
Ref<Resource> res = v;
if (res.is_valid()) {
hint = PROPERTY_HINT_RESOURCE_TYPE;
hint_string = res->get_class();
} }
}
if (v.get_type() != Variant::NIL) { if (v.get_type() != Variant::NIL) {
p_list->push_back(PropertyInfo(v.get_type(), "value", hint, hint_string)); p_list->push_back(PropertyInfo(v.get_type(), "value", hint, hint_string));
}
} }
} }