diff options
Diffstat (limited to 'editor/plugins/shader_file_editor_plugin.cpp')
-rw-r--r-- | editor/plugins/shader_file_editor_plugin.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/editor/plugins/shader_file_editor_plugin.cpp b/editor/plugins/shader_file_editor_plugin.cpp index 9d5ffd6516..0ac29f68f6 100644 --- a/editor/plugins/shader_file_editor_plugin.cpp +++ b/editor/plugins/shader_file_editor_plugin.cpp @@ -49,7 +49,6 @@ void ShaderFileEditor::_update_version(const StringName &p_version_txt, const RD } void ShaderFileEditor::_version_selected(int p_option) { - int c = versions->get_current(); StringName version_txt = versions->get_item_metadata(c); @@ -106,7 +105,6 @@ void ShaderFileEditor::_version_selected(int p_option) { } void ShaderFileEditor::_update_options() { - ERR_FAIL_COND(shader_file.is_null()); if (shader_file->get_base_error() != String()) { @@ -202,7 +200,6 @@ void ShaderFileEditor::_update_options() { } void ShaderFileEditor::_notification(int p_what) { - if (p_what == NOTIFICATION_WM_FOCUS_IN) { if (is_visible_in_tree() && shader_file.is_valid()) { _update_options(); @@ -211,7 +208,6 @@ void ShaderFileEditor::_notification(int p_what) { } void ShaderFileEditor::_editor_settings_changed() { - if (is_visible_in_tree() && shader_file.is_valid()) { _update_options(); } @@ -221,7 +217,6 @@ void ShaderFileEditor::_bind_methods() { } void ShaderFileEditor::edit(const Ref<RDShaderFile> &p_shader) { - if (p_shader.is_null()) { if (shader_file.is_valid()) { shader_file->disconnect("changed", callable_mp(this, &ShaderFileEditor::_shader_changed)); @@ -229,8 +224,9 @@ void ShaderFileEditor::edit(const Ref<RDShaderFile> &p_shader) { return; } - if (shader_file == p_shader) + if (shader_file == p_shader) { return; + } shader_file = p_shader; @@ -242,7 +238,6 @@ void ShaderFileEditor::edit(const Ref<RDShaderFile> &p_shader) { } void ShaderFileEditor::_shader_changed() { - if (is_visible_in_tree()) { _update_options(); } @@ -294,33 +289,29 @@ ShaderFileEditor::ShaderFileEditor(EditorNode *p_node) { } void ShaderFileEditorPlugin::edit(Object *p_object) { - RDShaderFile *s = Object::cast_to<RDShaderFile>(p_object); shader_editor->edit(s); } bool ShaderFileEditorPlugin::handles(Object *p_object) const { - RDShaderFile *shader = Object::cast_to<RDShaderFile>(p_object); return shader != nullptr; } void ShaderFileEditorPlugin::make_visible(bool p_visible) { - if (p_visible) { button->show(); editor->make_bottom_panel_item_visible(shader_editor); } else { - button->hide(); - if (shader_editor->is_visible_in_tree()) + if (shader_editor->is_visible_in_tree()) { editor->hide_bottom_panel(); + } } } ShaderFileEditorPlugin::ShaderFileEditorPlugin(EditorNode *p_node) { - editor = p_node; shader_editor = memnew(ShaderFileEditor(p_node)); |