feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -30,10 +30,6 @@
|
|||
|
||||
#include "shader_file_editor_plugin.h"
|
||||
|
||||
#include "core/io/resource_loader.h"
|
||||
#include "core/io/resource_saver.h"
|
||||
#include "core/os/keyboard.h"
|
||||
#include "core/os/os.h"
|
||||
#include "editor/editor_command_palette.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_string_names.h"
|
||||
|
|
@ -42,7 +38,6 @@
|
|||
#include "scene/gui/item_list.h"
|
||||
#include "scene/gui/split_container.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/rendering/shader_types.h"
|
||||
|
||||
/*** SHADER SCRIPT EDITOR ****/
|
||||
|
||||
|
|
@ -63,7 +58,7 @@ void ShaderFileEditor::_version_selected(int p_option) {
|
|||
|
||||
for (int i = 0; i < RD::SHADER_STAGE_MAX; i++) {
|
||||
if (bytecode->get_stage_bytecode(RD::ShaderStage(i)).is_empty() && bytecode->get_stage_compile_error(RD::ShaderStage(i)) == String()) {
|
||||
stages[i]->set_icon(Ref<Texture2D>());
|
||||
stages[i]->set_button_icon(Ref<Texture2D>());
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -73,7 +68,7 @@ void ShaderFileEditor::_version_selected(int p_option) {
|
|||
} else {
|
||||
icon = get_editor_theme_icon(SNAME("ImportCheck"));
|
||||
}
|
||||
stages[i]->set_icon(icon);
|
||||
stages[i]->set_button_icon(icon);
|
||||
|
||||
if (first_found == -1) {
|
||||
first_found = i;
|
||||
|
|
@ -218,9 +213,6 @@ void ShaderFileEditor::_editor_settings_changed() {
|
|||
}
|
||||
}
|
||||
|
||||
void ShaderFileEditor::_bind_methods() {
|
||||
}
|
||||
|
||||
void ShaderFileEditor::edit(const Ref<RDShaderFile> &p_shader) {
|
||||
if (p_shader.is_null()) {
|
||||
if (shader_file.is_valid()) {
|
||||
|
|
@ -260,6 +252,7 @@ ShaderFileEditor::ShaderFileEditor() {
|
|||
versions->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
|
||||
versions->connect(SceneStringName(item_selected), callable_mp(this, &ShaderFileEditor::_version_selected));
|
||||
versions->set_custom_minimum_size(Size2i(200 * EDSCALE, 0));
|
||||
versions->set_theme_type_variation("TreeSecondary");
|
||||
main_hs->add_child(versions);
|
||||
|
||||
VBoxContainer *main_vb = memnew(VBoxContainer);
|
||||
|
|
@ -323,7 +316,7 @@ ShaderFileEditorPlugin::ShaderFileEditorPlugin() {
|
|||
shader_editor = memnew(ShaderFileEditor);
|
||||
|
||||
shader_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
|
||||
button = EditorNode::get_bottom_panel()->add_item(TTR("ShaderFile"), shader_editor, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_shader_file_bottom_panel", TTR("Toggle ShaderFile Bottom Panel")));
|
||||
button = EditorNode::get_bottom_panel()->add_item(TTR("ShaderFile"), shader_editor, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_shader_file_bottom_panel", TTRC("Toggle ShaderFile Bottom Panel")));
|
||||
button->hide();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue