godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81410 from bitsawer/fix_shader_include_reload

Browse Source 
Fix shader text editor include file reloading
This commit is contained in:
Rémi Verschelde 2023-09-07 16:32:54 +02:00
commit 074931a3aa
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/plugins/text_shader_editor.cpp
View File

@ -179,7 +179,14 @@ void ShaderTextEditor::set_edited_code(const String &p_code) {
} }
void ShaderTextEditor::reload_text() { void ShaderTextEditor::reload_text() {
ERR_FAIL_COND(shader.is_null()); ERR_FAIL_COND(shader.is_null() && shader_inc.is_null());
String code;
if (shader.is_valid()) {
code = shader->get_code();
} else {
code = shader_inc->get_code();
}
CodeEdit *te = get_text_editor(); CodeEdit *te = get_text_editor();
int column = te->get_caret_column(); int column = te->get_caret_column();
@ -187,7 +194,7 @@ void ShaderTextEditor::reload_text() {
int h = te->get_h_scroll(); int h = te->get_h_scroll();
int v = te->get_v_scroll(); int v = te->get_v_scroll();
te->set_text(shader->get_code()); te->set_text(code);
te->set_caret_line(row); te->set_caret_line(row);
te->set_caret_column(column); te->set_caret_column(column);
te->set_h_scroll(h); te->set_h_scroll(h);