diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-14 12:26:56 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-14 14:52:23 +0100 |
| commit | 93ab45b6b5c4f8e0619e963156c983009d399a9d (patch) | |
| tree | 80e55993f29ad7bf502ef7388eef78114b2dc4ab /tools/editor/plugins/shader_editor_plugin.cpp | |
| parent | 78e90ac60b81f17fdf8c319357f16962e92e6106 (diff) | |
| download | redot-engine-93ab45b6b5c4f8e0619e963156c983009d399a9d.tar.gz | |
Style: Fix whole-line commented code
They do not play well with clang-format which aligns the `//` part
with the rest of the code block, thus producing badly indented commented code.
Diffstat (limited to 'tools/editor/plugins/shader_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/shader_editor_plugin.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tools/editor/plugins/shader_editor_plugin.cpp b/tools/editor/plugins/shader_editor_plugin.cpp index a42158c7b0..90d0f7fc93 100644 --- a/tools/editor/plugins/shader_editor_plugin.cpp +++ b/tools/editor/plugins/shader_editor_plugin.cpp @@ -127,7 +127,7 @@ void ShaderTextEditor::_load_theme_settings() { } //colorize core types -// Color basetype_color= EDITOR_DEF("text_editor/base_type_color",Color(0.3,0.3,0.0)); + //Color basetype_color= EDITOR_DEF("text_editor/base_type_color",Color(0.3,0.3,0.0)); //colorize comments @@ -253,9 +253,9 @@ void ShaderEditor::_menu_option(int p_option) { current->get_find_replace_bar()->popup_replace(); } break; -// case SEARCH_LOCATE_SYMBOL: { + //case SEARCH_LOCATE_SYMBOL: { -// } break; + //} break; case SEARCH_GOTO_LINE: { goto_line_dialog->popup_find_line(current->get_text_edit()); @@ -396,7 +396,7 @@ void ShaderEditor::_bind_methods() { ClassDB::bind_method("_menu_option",&ShaderEditor::_menu_option); ClassDB::bind_method("_params_changed",&ShaderEditor::_params_changed); ClassDB::bind_method("apply_shaders",&ShaderEditor::apply_shaders); -// ClassDB::bind_method("_close_current_tab",&ShaderEditor::_close_current_tab); + //ClassDB::bind_method("_close_current_tab",&ShaderEditor::_close_current_tab); } void ShaderEditor::ensure_select_current() { @@ -481,7 +481,7 @@ ShaderEditor::ShaderEditor() { search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_previous", TTR("Find Previous"), KEY_MASK_SHIFT|KEY_F3), SEARCH_FIND_PREV); search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/replace", TTR("Replace.."), KEY_MASK_CMD|KEY_R), SEARCH_REPLACE); search_menu->get_popup()->add_separator(); -// search_menu->get_popup()->add_item("Locate Symbol..",SEARCH_LOCATE_SYMBOL,KEY_MASK_CMD|KEY_K); + //search_menu->get_popup()->add_item("Locate Symbol..",SEARCH_LOCATE_SYMBOL,KEY_MASK_CMD|KEY_K); search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_line", TTR("Goto Line.."), KEY_MASK_CMD|KEY_L), SEARCH_GOTO_LINE); search_menu->get_popup()->connect("id_pressed", this,"_menu_option"); @@ -512,8 +512,10 @@ bool ShaderEditorPlugin::handles(Object *p_object) const { bool handles = true; Shader *shader=p_object->cast_to<Shader>(); - //if (!shader || shader->cast_to<ShaderGraph>()) // Dont handle ShaderGraph's - // handles = false; + /* + if (!shader || shader->cast_to<ShaderGraph>()) // Dont handle ShaderGraph's + handles = false; + */ return shader!=NULL; } |