From cb0e357d0b8565fcba6f2cf0ec5ea8e795e3fc2a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 15 Aug 2017 11:41:17 -0300 Subject: Converting to MeshLibrary works again, fixes #8092 --- editor/editor_node.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'editor/editor_node.cpp') diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 730ba3cac..b2e21fa16 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1214,7 +1214,7 @@ void EditorNode::_dialog_action(String p_file) { ml = Ref(memnew(MeshLibrary)); } - //MeshLibraryEditor::update_library_file(editor_data.get_edited_scene_root(),ml,true); + MeshLibraryEditor::update_library_file(editor_data.get_edited_scene_root(), ml, true); Error err = ResourceSaver::save(p_file, ml); if (err) { @@ -1246,7 +1246,7 @@ void EditorNode::_dialog_action(String p_file) { } } else { - ml = Ref(memnew(TileSet)); + ml.instance(); } TileSetEditor::update_library_file(editor_data.get_edited_scene_root(), ml, true); @@ -6058,7 +6058,7 @@ EditorNode::EditorNode() { add_editor_plugin(memnew(MultiMeshEditorPlugin(this))); add_editor_plugin(memnew(MeshInstanceEditorPlugin(this))); add_editor_plugin(memnew(AnimationTreeEditorPlugin(this))); - //add_editor_plugin( memnew( MeshLibraryEditorPlugin(this) ) ); + add_editor_plugin(memnew(MeshLibraryEditorPlugin(this))); add_editor_plugin(memnew(StyleBoxEditorPlugin(this))); add_editor_plugin(memnew(ParticlesEditorPlugin(this))); add_editor_plugin(memnew(ResourcePreloaderEditorPlugin(this))); -- cgit v1.3