godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Style: Re-apply clang-format over recent invalid additions

Browse Source
This commit is contained in:
Rémi Verschelde
2017-12-10 01:27:02 +01:00
parent 7cb6e6b723
commit a845411454
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_help.cpp
View File

@@ -202,8 +202,9 @@ class EditorHelpSearch::IncrementalSearch : public Reference {
} }
public: public:
IncrementalSearch(EditorHelpSearch *p_search, Tree *p_search_options, const String &p_term) IncrementalSearch(EditorHelpSearch *p_search, Tree *p_search_options, const String &p_term) :
: search(p_search), search_options(p_search_options) { search(p_search),
search_options(p_search_options) {
def_icon = search->get_icon("Node", "EditorIcons"); def_icon = search->get_icon("Node", "EditorIcons");
doc = EditorHelp::get_doc_data(); doc = EditorHelp::get_doc_data();

1
editor/editor_node.cpp
View File

@@ -3366,7 +3366,6 @@ void EditorNode::register_editor_types() {
ClassDB::register_class<EditorResourceConversionPlugin>(); ClassDB::register_class<EditorResourceConversionPlugin>();
ClassDB::register_class<EditorSceneImporter>(); ClassDB::register_class<EditorSceneImporter>();
// FIXME: Is this stuff obsolete, or should it be ported to new APIs? // FIXME: Is this stuff obsolete, or should it be ported to new APIs?
ClassDB::register_class<EditorScenePostImport>(); ClassDB::register_class<EditorScenePostImport>();
//ClassDB::register_type<EditorImportExport>(); //ClassDB::register_type<EditorImportExport>();

2
editor/editor_plugin.h
View File

@@ -31,11 +31,11 @@
#define EDITOR_PLUGIN_H #define EDITOR_PLUGIN_H
#include "editor/import/editor_import_plugin.h" #include "editor/import/editor_import_plugin.h"
#include "editor/import/resource_importer_scene.h"
#include "io/config_file.h" #include "io/config_file.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "editor/import/resource_importer_scene.h"
#include "undo_redo.h" #include "undo_redo.h"
/** /**