Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Fix shader text editor include file reloading

4.2
bitsawer 2023-09-07 14:35:26 +07:00
parent 8449592d92
commit d50595c0e9
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
Unescape Escape View File

@ -179,7 +179,14 @@ void ShaderTextEditor::set_edited_code(const String &p_code) {
}
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();
int column = te->get_caret_column();
@ -187,7 +194,7 @@ void ShaderTextEditor::reload_text() {
int h = te->get_h_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_column(column);
te->set_h_scroll(h);