godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

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

18
editor/plugins/cube_grid_theme_editor_plugin.h
View File

@@ -33,10 +33,9 @@
#include "editor/editor_node.h"
#include "scene/resources/mesh_library.h"
#if 0
class MeshLibraryEditor : public Control {
GDCLASS( MeshLibraryEditor, Control );
GDCLASS(MeshLibraryEditor, Control);
Ref<MeshLibrary> theme;
@@ -55,7 +54,7 @@ class MeshLibraryEditor : public Control {
};
int option;
void _import_scene_cbk(const String& p_str);
void _import_scene_cbk(const String &p_str);
void _menu_cbk(int p_option);
void _menu_confirm();
@@ -63,25 +62,22 @@ class MeshLibraryEditor : public Control {
protected:
static void _bind_methods();
public:
void edit(const Ref<MeshLibrary>& p_theme);
static Error update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml,bool p_merge=true);
public:
void edit(const Ref<MeshLibrary> &p_theme);
static Error update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml, bool p_merge = true);
MeshLibraryEditor(EditorNode *p_editor);
};
class MeshLibraryEditorPlugin : public EditorPlugin {
GDCLASS( MeshLibraryEditorPlugin, EditorPlugin );
GDCLASS(MeshLibraryEditorPlugin, EditorPlugin);
MeshLibraryEditor *theme_editor;
EditorNode *editor;
public:
virtual String get_name() const { return "MeshLibrary"; }
bool has_main_screen() const { return false; }
virtual void edit(Object *p_node);
@@ -89,8 +85,6 @@ public:
virtual void make_visible(bool p_visible);
MeshLibraryEditorPlugin(EditorNode *p_node);
};
#endif // CUBE_GRID_THEME_EDITOR_PLUGIN_H
#endif