Browse Source

Merge pull request #29073 from Chaosus/express_fixes

Fix few bugs in expression node
Yuri Roubinsky 6 years ago
parent
commit
ebb6eb8be8

+ 2 - 2
editor/plugins/visual_shader_editor_plugin.cpp

@@ -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 - 0
scene/resources/visual_shader.cpp

@@ -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(")");