Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Converting to MeshLibrary works again, fixes #8092

Browse source
This commit is contained in:
Juan Linietsky 2017-08-15 11:41:17 -03:00
parent fdc2cdef0b
commit cb0e357d0b
4 changed files with 185 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editor/editor_node.cpp
View file

@ -1214,7 +1214,7 @@ void EditorNode::_dialog_action(String p_file) {
ml = Ref<MeshLibrary>(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<TileSet>(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)));