godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
editor/plugins/cube_grid_theme_editor_plugin.h
View File

@@ -29,13 +29,12 @@
#ifndef CUBE_GRID_THEME_EDITOR_PLUGIN_H
#define CUBE_GRID_THEME_EDITOR_PLUGIN_H
#include "scene/resources/mesh_library.h"
#include "editor/editor_node.h"
#include "scene/resources/mesh_library.h"
class MeshLibraryEditor : public Control {
OBJ_TYPE( MeshLibraryEditor, Control );
OBJ_TYPE(MeshLibraryEditor, Control);
Ref<MeshLibrary> theme;
@@ -54,7 +53,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();
@@ -62,25 +61,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 {
OBJ_TYPE( MeshLibraryEditorPlugin, EditorPlugin );
OBJ_TYPE(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);
@@ -88,8 +84,6 @@ public:
virtual void make_visible(bool p_visible);
MeshLibraryEditorPlugin(EditorNode *p_node);
};
#endif // CUBE_GRID_THEME_EDITOR_PLUGIN_H