Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-23 13:41:43 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #29073 from Chaosus/express_fixes

Browse Source 
Fix few bugs in expression node
This commit is contained in:
Yuri Roubinsky 2019-05-21 19:26:14 +03:00 committed by GitHub
commit ebb6eb8be8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -984,9 +984,9 @@ void VisualShaderEditor::_set_node_size(int p_type, int p_node, const Vector2 &p
box_size.x = gn->get_size().x;
}
}
box_size.x -= text_box->get_margin(Margin::MARGIN_LEFT);
box_size.x -= text_box->get_margin(MARGIN_LEFT);
box_size.x -= 28 * EDSCALE;
box_size.y -= text_box->get_margin(Margin::MARGIN_TOP);
box_size.y -= text_box->get_margin(MARGIN_TOP);
box_size.y -= 28 * EDSCALE;
text_box->set_custom_minimum_size(Size2(box_size.x, box_size.y));
text_box->set_size(Size2(1, 1));

1
scene/resources/visual_shader.cpp
View File

@ -2204,6 +2204,7 @@ String VisualShaderNodeExpression::generate_code(Shader::Mode p_mode, VisualShad
if (post_symbols.empty()) {
post_symbols.push_back("\t");
post_symbols.push_back("\n");
post_symbols.push_back(";");
post_symbols.push_back("}");
post_symbols.push_back("]");
post_symbols.push_back(")");