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

Fix some errors after shader preprocessor PR

Browse Source
This commit is contained in:
Yuri Rubinsky
2022-07-23 09:38:59 +03:00
parent fe929d4787
commit 6d992abb54
3 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/shader_editor_plugin.cpp
View File

@@ -381,7 +381,7 @@ void ShaderTextEditor::_validate_script() {
//preprocessor error
ERR_FAIL_COND(err_positions.size() == 0);
String error_text;
String error_text = error_pp;
int error_line = err_positions.front()->get().line;
if (err_positions.size() == 1) {
// Error in main file
@@ -1198,12 +1198,12 @@ void ShaderEditorPlugin::edit(Object *p_object) {
Ref<VisualShader> vs = es.shader;
if (vs.is_valid()) {
es.visual_shader_editor = memnew(VisualShaderEditor);
es.visual_shader_editor->edit(vs.ptr());
shader_tabs->add_child(es.visual_shader_editor);
es.visual_shader_editor->edit(vs.ptr());
} else {
es.shader_editor = memnew(ShaderEditor);
es.shader_editor->edit(s);
shader_tabs->add_child(es.shader_editor);
es.shader_editor->edit(s);
es.shader_editor->connect("validation_changed", callable_mp(this, &ShaderEditorPlugin::_update_shader_list_status));
}
}