mirror of
https://github.com/godotengine/godot.git
synced 2025-03-01 23:21:39 +08:00
Merge pull request #49695 from kleonc/animation-track-editor-multi-edit-easing
AnimationMultiTrackKeyEdit Allow editing easing if it's possible for all edited tracks
This commit is contained in:
commit
8ffb631cdb
@ -1168,31 +1168,29 @@ public:
|
||||
p_list->push_back(PropertyInfo(Variant::VECTOR3, "scale"));
|
||||
} break;
|
||||
case Animation::TYPE_VALUE: {
|
||||
if (!same_key_type) {
|
||||
break;
|
||||
}
|
||||
if (same_key_type) {
|
||||
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) {
|
||||
PropertyInfo pi = hint;
|
||||
pi.name = "value";
|
||||
p_list->push_back(pi);
|
||||
} else {
|
||||
PropertyHint hint = PROPERTY_HINT_NONE;
|
||||
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::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) {
|
||||
p_list->push_back(PropertyInfo(v.get_type(), "value", hint, hint_string));
|
||||
if (v.get_type() != Variant::NIL) {
|
||||
p_list->push_back(PropertyInfo(v.get_type(), "value", hint, hint_string));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user