godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge pull request #84628 from KoBeWi/no_meta_only_path

Browse Source 
Don't store shader edit path in metadata
This commit is contained in:
Rémi Verschelde
2023-11-08 19:18:55 +01:00
parent 57a0ac27d5 9c810ef061
commit e5bacbc471
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/shader_editor_plugin.cpp
View File

@@ -65,9 +65,7 @@ void ShaderEditorPlugin::_update_shader_list() {
} }
// When shader is deleted in filesystem dock, need this to correctly close shader editor. // When shader is deleted in filesystem dock, need this to correctly close shader editor.
if (!path.is_empty()) { edited_shader.path = path;
shader->set_meta("_edit_res_path", path);
}
bool unsaved = false; bool unsaved = false;
if (edited_shader.shader_editor) { if (edited_shader.shader_editor) {
@@ -578,9 +576,9 @@ void ShaderEditorPlugin::_window_changed(bool p_visible) {
void ShaderEditorPlugin::_file_removed(const String &p_removed_file) { void ShaderEditorPlugin::_file_removed(const String &p_removed_file) {
for (uint32_t i = 0; i < edited_shaders.size(); i++) { for (uint32_t i = 0; i < edited_shaders.size(); i++) {
const Ref<Shader> &shader = edited_shaders[i].shader; if (edited_shaders[i].path == p_removed_file) {
if (shader->get_meta("_edit_res_path") == p_removed_file) {
_close_shader(i); _close_shader(i);
break;
} }
} }
} }

1
editor/plugins/shader_editor_plugin.h
View File

@@ -50,6 +50,7 @@ class ShaderEditorPlugin : public EditorPlugin {
Ref<ShaderInclude> shader_inc; Ref<ShaderInclude> shader_inc;
TextShaderEditor *shader_editor = nullptr; TextShaderEditor *shader_editor = nullptr;
VisualShaderEditor *visual_shader_editor = nullptr; VisualShaderEditor *visual_shader_editor = nullptr;
String path;
}; };
LocalVector<EditedShader> edited_shaders; LocalVector<EditedShader> edited_shaders;