diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-13 09:13:23 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-13 09:13:34 +0200 |
| commit | e73e00d369abe54009e70498238c286708bf365a (patch) | |
| tree | f18692f3f844f11d5b17146eb92eb71881e261ba /editor | |
| parent | a4005221f5968e829bdb0e5ec699ed91460b4a2d (diff) | |
Style: Apply clang-format to @reduz's changes
[ci skip]
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_help.cpp | 8 | ||||
| -rw-r--r-- | editor/import/resource_importer_texture.cpp | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 674ad767f0..a5baf62ea0 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -652,7 +652,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { Ref<Font> doc_font = get_font("doc", "EditorFonts"); Ref<Font> doc_title_font = get_font("doc_title", "EditorFonts"); Ref<Font> doc_code_font = get_font("doc_source", "EditorFonts"); - String link_color_text=Color(EditorSettings::get_singleton()->get("text_editor/highlighting/keyword_color")).to_html(false); + String link_color_text = Color(EditorSettings::get_singleton()->get("text_editor/highlighting/keyword_color")).to_html(false); h_color = Color(1, 1, 1, 1); @@ -1256,7 +1256,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { class_desc->add_image(get_icon("Error", "EditorIcons")); class_desc->add_text(" "); class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/highlighting/comment_color")); - class_desc->append_bbcode(TTR("There is currently no description for this property. Please help us by [color=$color][url=$url]contributing one[/url][/color]!").replace("$url",CONTRIBUTE_URL).replace("$color",link_color_text)); + class_desc->append_bbcode(TTR("There is currently no description for this property. Please help us by [color=$color][url=$url]contributing one[/url][/color]!").replace("$url", CONTRIBUTE_URL).replace("$color", link_color_text)); class_desc->pop(); } class_desc->pop(); @@ -1340,13 +1340,13 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/highlighting/text_color")); class_desc->push_font(doc_font); class_desc->push_indent(1); - if (methods[i].description.strip_edges()!=String()) { + if (methods[i].description.strip_edges() != String()) { _add_text(methods[i].description); } else { class_desc->add_image(get_icon("Error", "EditorIcons")); class_desc->add_text(" "); class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/highlighting/comment_color")); - class_desc->append_bbcode(TTR("There is currently no description for this method. Please help us by [color=$color][url=$url]contributing one[/url][/color]!").replace("$url",CONTRIBUTE_URL).replace("$color",link_color_text)); + class_desc->append_bbcode(TTR("There is currently no description for this method. Please help us by [color=$color][url=$url]contributing one[/url][/color]!").replace("$url", CONTRIBUTE_URL).replace("$color", link_color_text)); class_desc->pop(); } diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp index f29bdde634..3e3f1d1e19 100644 --- a/editor/import/resource_importer_texture.cpp +++ b/editor/import/resource_importer_texture.cpp @@ -30,10 +30,11 @@ #include "resource_importer_texture.h" #include "editor/editor_file_system.h" +#include "editor/editor_node.h" #include "io/config_file.h" #include "io/image_loader.h" #include "scene/resources/texture.h" -#include "editor/editor_node.h" + void ResourceImporterTexture::_texture_reimport_srgb(const Ref<StreamTexture> &p_tex) { singleton->mutex->lock(); @@ -412,13 +413,13 @@ Error ResourceImporterTexture::import(const String &p_source_file, const String //must import in all formats, in order of priority (so platform choses the best supported one. IE, etc2 over etc). //Android, GLES 2.x - bool ok_on_pc=false; + bool ok_on_pc = false; if (ProjectSettings::get_singleton()->get("rendering/vram_compression/import_s3tc")) { _save_stex(image, p_save_path + ".s3tc.stex", compress_mode, lossy, Image::COMPRESS_S3TC, mipmaps, tex_flags, stream, detect_3d, detect_srgb, force_rgbe, detect_normal, force_normal); r_platform_variants->push_back("s3tc"); - ok_on_pc=true; + ok_on_pc = true; } if (ProjectSettings::get_singleton()->get("rendering/vram_compression/import_etc2")) { |