northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #71418 from TokageItLab/restart-anim-tree

Browse Source 
Allow AnimationStateMachine / AnimationNode to restart when transitioning to the same state
This commit is contained in:
Rémi Verschelde
2023-01-19 21:52:35 +01:00
parent a202f5104f e480262c53
commit d919d77367
10 changed files with 175 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_properties.cpp
View File

@ -342,12 +342,17 @@ void EditorPropertyTextEnum::_notification(int p_what) {
}
EditorPropertyTextEnum::EditorPropertyTextEnum() {
HBoxContainer *hb = memnew(HBoxContainer);
add_child(hb);
default_layout = memnew(HBoxContainer);
add_child(default_layout);
default_layout->set_h_size_flags(SIZE_EXPAND_FILL);
hb->add_child(default_layout);
edit_custom_layout = memnew(HBoxContainer);
edit_custom_layout->set_h_size_flags(SIZE_EXPAND_FILL);
edit_custom_layout->hide();
add_child(edit_custom_layout);
hb->add_child(edit_custom_layout);
option_button = memnew(OptionButton);
option_button->set_h_size_flags(SIZE_EXPAND_FILL);