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

Fix skeleton_3d & physical_bone_3d editor errors

Browse Source 
(cherry picked from commit 679ff6da0e)
This commit is contained in:
Samuele Panzeri 2023-04-29 23:17:47 +02:00 committed by Rémi Verschelde
parent 9d9b7511a0
commit 07128ccb9d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/plugins/physical_bone_3d_editor_plugin.cpp
View File

@ -96,8 +96,9 @@ void PhysicalBone3DEditorPlugin::make_visible(bool p_visible) {
} }
void PhysicalBone3DEditorPlugin::edit(Object *p_node) { void PhysicalBone3DEditorPlugin::edit(Object *p_node) {
selected = static_cast<PhysicalBone3D *>(p_node); // Trust it PhysicalBone3D *bone = Object::cast_to<PhysicalBone3D>(p_node);
ERR_FAIL_COND(!selected); if (bone) {
selected = bone;
physical_bone_editor.set_selected(selected); physical_bone_editor.set_selected(selected);
}
} }

4
editor/plugins/skeleton_3d_editor_plugin.cpp
View File

@ -831,8 +831,8 @@ void Skeleton3DEditor::create_editors() {
void Skeleton3DEditor::_notification(int p_what) { void Skeleton3DEditor::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
create_editors();
update_joint_tree(); update_joint_tree();
update_editors();
joint_tree->connect("item_selected", callable_mp(this, &Skeleton3DEditor::_joint_tree_selection_changed)); joint_tree->connect("item_selected", callable_mp(this, &Skeleton3DEditor::_joint_tree_selection_changed));
joint_tree->connect("item_mouse_selected", callable_mp(this, &Skeleton3DEditor::_joint_tree_rmb_select)); joint_tree->connect("item_mouse_selected", callable_mp(this, &Skeleton3DEditor::_joint_tree_rmb_select));
@ -945,8 +945,6 @@ void fragment() {
handles_mesh_instance->set_cast_shadows_setting(GeometryInstance3D::SHADOW_CASTING_SETTING_OFF); handles_mesh_instance->set_cast_shadows_setting(GeometryInstance3D::SHADOW_CASTING_SETTING_OFF);
handles_mesh.instantiate(); handles_mesh.instantiate();
handles_mesh_instance->set_mesh(handles_mesh); handles_mesh_instance->set_mesh(handles_mesh);
create_editors();
} }
void Skeleton3DEditor::update_bone_original() { void Skeleton3DEditor::update_bone_original() {