diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-09-12 12:55:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-12 12:55:53 +0200 |
commit | aabbd00284640a4789f96702c134ea40b11b402e (patch) | |
tree | 8363659a6551644b0d89401681e2909d5451a119 /editor/plugins/shader_editor_plugin.cpp | |
parent | c5e0e31f5106d7d91dc478af1f86740c74cea824 (diff) | |
parent | b2a38854fdde296fd2d7da139a29b23a18ab494d (diff) |
Merge pull request #10908 from hpvb/fix-unused-variables
Fix unused variable warnings
Diffstat (limited to 'editor/plugins/shader_editor_plugin.cpp')
-rw-r--r-- | editor/plugins/shader_editor_plugin.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index b02016c273..1b02f18d85 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -164,6 +164,8 @@ void ShaderTextEditor::_code_complete_script(const String &p_code, List<String> String calltip; Error err = sl.complete(p_code, ShaderTypes::get_singleton()->get_functions(VisualServer::ShaderMode(shader->get_mode())), ShaderTypes::get_singleton()->get_modes(VisualServer::ShaderMode(shader->get_mode())), ShaderTypes::get_singleton()->get_types(), r_options, calltip); + if (err != OK) + ERR_PRINT("Shaderlang complete failed"); if (calltip != "") { get_text_edit()->set_code_hint(calltip); @@ -403,13 +405,7 @@ void ShaderEditorPlugin::edit(Object *p_object) { bool ShaderEditorPlugin::handles(Object *p_object) const { - bool handles = true; Shader *shader = Object::cast_to<Shader>(p_object); - /* - if (Object::cast_to<ShaderGraph>(shader)) // Don't handle ShaderGraph's - handles = false; - */ - return shader != NULL; } |