maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge 8ed1e41a53 into eb98fd9442

Browse source
This commit is contained in:
TwistedTwigleg 2021-11-09 08:39:28 -08:00 committed by GitHub
parent eb98fd9442 8ed1e41a53
commit 0a427fa28b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/plugins/skeleton_3d_editor_plugin.cpp
View file

@ -569,6 +569,8 @@ void Skeleton3DEditor::update_joint_tree() {
Ref<Texture> bone_icon = get_theme_icon(SNAME("BoneAttachment3D"), SNAME("EditorIcons"));
skeleton->_update_process_order();
Vector<int> bones_to_process = skeleton->get_parentless_bones();
while (bones_to_process.size() > 0) {
int current_bone_idx = bones_to_process[0];

3
scene/3d/skeleton_3d.h
View file

@ -147,8 +147,6 @@ private:
uint64_t version = 1;
void _update_process_order();
protected:
bool _get(const StringName &p_path, Variant &r_ret) const;
bool _set(const StringName &p_path, const Variant &p_value);
@ -176,6 +174,7 @@ public:
};
// skeleton creation api
void _update_process_order();
void add_bone(const String &p_name);
int find_bone(const String &p_name) const;
String get_bone_name(int p_bone) const;