Merge pull request #81410 from bitsawer/fix_shader_include_reload

Fix shader text editor include file reloading
godotengine · Sep 7, 2023 · 074931a · 074931a
2 parents 5641d44 + d50595c
commit 074931a
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/editor/plugins/text_shader_editor.cpp b/editor/plugins/text_shader_editor.cpp
@@ -179,15 +179,22 @@ 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();
 	int row = te->get_caret_line();
 	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);