Merge pull request #22339 from AndreaCatania/fixes2

Toward 3.1 - physics fixes

1 files changed, 7 insertions, 17 deletions

diff --git a/editor/plugins/physical_bone_plugin.cpp b/editor/plugins/physical_bone_plugin.cpp
index 1c3c000808..6341d7f2ef 100644
--- a/editor/plugins/physical_bone_plugin.cpp
+++ b/editor/plugins/physical_bone_plugin.cpp
@@ -69,15 +69,7 @@ PhysicalBoneEditor::PhysicalBoneEditor(EditorNode *p_editor) :
 	hide();
 }
 
-PhysicalBoneEditor::~PhysicalBoneEditor() {
-	// TODO the spatial_editor_hb should be removed from SpatialEditor, but in this moment it's not possible
-	for (int i = spatial_editor_hb->get_child_count() - 1; 0 <= i; --i) {
-		Node *n = spatial_editor_hb->get_child(i);
-		spatial_editor_hb->remove_child(n);
-		memdelete(n);
-	}
-	memdelete(spatial_editor_hb);
-}
+PhysicalBoneEditor::~PhysicalBoneEditor() {}
 
 void PhysicalBoneEditor::set_selected(PhysicalBone *p_pb) {
 
@@ -98,19 +90,17 @@ void PhysicalBoneEditor::show() {
 
 PhysicalBonePlugin::PhysicalBonePlugin(EditorNode *p_editor) :
 		editor(p_editor),
-		selected(NULL) {
-
-	physical_bone_editor = memnew(PhysicalBoneEditor(editor));
-}
+		selected(NULL),
+		physical_bone_editor(editor) {}
 
 void PhysicalBonePlugin::make_visible(bool p_visible) {
 	if (p_visible) {
 
-		physical_bone_editor->show();
+		physical_bone_editor.show();
 	} else {
 
-		physical_bone_editor->hide();
-		physical_bone_editor->set_selected(NULL);
+		physical_bone_editor.hide();
+		physical_bone_editor.set_selected(NULL);
 		selected = NULL;
 	}
 }
@@ -119,5 +109,5 @@ void PhysicalBonePlugin::edit(Object *p_node) {
 	selected = static_cast<PhysicalBone *>(p_node); // Trust it
 	ERR_FAIL_COND(!selected);
 
-	physical_bone_editor->set_selected(selected);
+	physical_bone_editor.set_selected(selected);
 }