summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorHubert Jarosz <marqin.pl@gmail.com>2016-05-21 15:29:25 +0200
committerHubert Jarosz <marqin.pl@gmail.com>2016-05-21 15:29:25 +0200
commit33403d91f77f1f34b19bff763391500bc9c2616c (patch)
tree67b2f4f4f1d69b198af548a7358b98904d9581ae /tools
parentb0a5347a1ceaff56e88d33fb13df2a91abae594f (diff)
remove trailing whitespace
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/editor_node.cpp6
-rw-r--r--tools/editor/editor_node.h4
-rw-r--r--tools/editor/editor_settings.cpp2
-rw-r--r--tools/editor/plugins/spatial_editor_plugin.cpp8
-rw-r--r--tools/editor/plugins/theme_editor_plugin.cpp2
-rw-r--r--tools/editor/plugins/tile_map_editor_plugin.h2
-rw-r--r--tools/editor/project_export.cpp2
-rw-r--r--tools/editor/register_exporters.h2
-rw-r--r--tools/editor/scene_tree_dock.cpp2
9 files changed, 15 insertions, 15 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 7cff6dab9c..f638f177ec 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -1712,7 +1712,7 @@ void EditorNode::_edit_current() {
_set_top_editors(sub_plugins);
_set_editing_top_editors(current_obj);
_display_top_editors(true);
-
+
} else if (!editor_plugins_over->get_plugins_list().empty()) {
_hide_top_editors();
@@ -6400,7 +6400,7 @@ EditorNode::EditorNode() {
EditorNode::~EditorNode() {
-
+
memdelete( EditorHelp::get_doc_data() );
memdelete(editor_selection);
memdelete(editor_plugins_over);
@@ -6466,6 +6466,6 @@ EditorPluginList::EditorPluginList() {
EditorPluginList::~EditorPluginList() {
}
-
+
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index 8fa6cfefcf..72bf8c624c 100644
--- a/tools/editor/editor_node.h
+++ b/tools/editor/editor_node.h
@@ -451,7 +451,7 @@ private:
void _display_top_editors(bool p_display);
void _set_top_editors(Vector<EditorPlugin*> p_editor_plugins_over);
void _set_editing_top_editors(Object * p_current_object);
-
+
void _quick_opened();
void _quick_run();
@@ -746,7 +746,7 @@ public:
EditorPluginList();
~EditorPluginList();
-} ;
+} ;
struct EditorProgressBG {
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index a83125d0bb..91d7e7ebd4 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -464,7 +464,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
set("2d_editor/bone_color2",Color(0.75,0.75,0.75,0.9));
set("2d_editor/bone_selected_color",Color(0.9,0.45,0.45,0.9));
set("2d_editor/bone_ik_color",Color(0.9,0.9,0.45,0.9));
-
+
set("2d_editor/keep_margins_when_changing_anchors", false);
set("game_window_placement/rect",0);
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp
index 30296100d0..fa99a3d335 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/tools/editor/plugins/spatial_editor_plugin.cpp
@@ -1229,7 +1229,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
case InputEvent::MOUSE_MOTION: {
const InputEventMouseMotion &m=p_event.mouse_motion;
_edit.mouse_pos=Point2(p_event.mouse_motion.x,p_event.mouse_motion.y);
-
+
if (spatial_editor->get_selected()) {
@@ -1265,7 +1265,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
NavigationScheme nav_scheme = _get_navigation_schema("3d_editor/navigation_scheme");
NavigationMode nav_mode = NAVIGATION_NONE;
-
+
if (_edit.gizmo.is_valid()) {
Plane plane=Plane(_edit.gizmo_initial_pos,_get_camera_normal());
@@ -1591,7 +1591,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
mod=KEY_CONTROL;
if (m.mod.meta)
mod=KEY_META;
-
+
if(mod){
if (mod == _get_key_modifier("3d_editor/pan_modifier"))
nav_mode = NAVIGATION_PAN;
@@ -1815,7 +1815,7 @@ void SpatialEditorViewport::_notification(int p_what) {
if (visible)
_update_camera();
-
+
call_deferred("update_transform_gizmo_view");
}
diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/tools/editor/plugins/theme_editor_plugin.cpp
index 5321a7b6d8..37cb0398e7 100644
--- a/tools/editor/plugins/theme_editor_plugin.cpp
+++ b/tools/editor/plugins/theme_editor_plugin.cpp
@@ -398,7 +398,7 @@ void ThemeEditor::_dialog_cbk() {
}
- } break;
+ } break;
case POPUP_CLASS_REMOVE: {
StringName fromtype = type_edit->get_text();
List<StringName> names;
diff --git a/tools/editor/plugins/tile_map_editor_plugin.h b/tools/editor/plugins/tile_map_editor_plugin.h
index b1da1bc48e..92b54a4cbb 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.h
+++ b/tools/editor/plugins/tile_map_editor_plugin.h
@@ -130,7 +130,7 @@ class TileMapEditor : public VBoxContainer {
void _fill_points(const DVector<Vector2> p_points, const Dictionary& p_op);
void _erase_points(const DVector<Vector2> p_points);
-
+
void _select(const Point2i& p_from, const Point2i& p_to);
void _draw_cell(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Matrix32& p_xform);
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index ee9eee1590..dea15ebd35 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -470,7 +470,7 @@ void ProjectExportDialog::_export_action(const String& p_file) {
/* Checked if the export location is outside the project directory,
* now will check if a file name has been entered */
if (p_file.ends_with("/")) {
-
+
error->set_text("Please enter a file name!");
error->popup_centered_minsize();
return;
diff --git a/tools/editor/register_exporters.h b/tools/editor/register_exporters.h
index 364ad5efc9..dccaa0641f 100644
--- a/tools/editor/register_exporters.h
+++ b/tools/editor/register_exporters.h
@@ -32,4 +32,4 @@
void register_exporters();
-#endif \ No newline at end of file
+#endif
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp
index 0da233deca..7c64ed60b1 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -1241,7 +1241,7 @@ void SceneTreeDock::_selection_changed() {
//automatically turn on multi-edit
_tool_selected(TOOL_MULTI_EDIT);
}
-
+
//tool_buttons[TOOL_MULTI_EDIT]->set_disabled(EditorNode::get_singleton()->get_editor_selection()->get_selection().size()<2);
}