Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
ebb6eb8b
Unverified
Commit
ebb6eb8b
authored
May 21, 2019
by
Yuri Roubinsky
Committed by
GitHub
May 21, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #29073 from Chaosus/express_fixes
Fix few bugs in expression node
parents
b6bd19df
6f2abd68
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
visual_shader_editor_plugin.cpp
editor/plugins/visual_shader_editor_plugin.cpp
+2
-2
visual_shader.cpp
scene/resources/visual_shader.cpp
+1
-0
No files found.
editor/plugins/visual_shader_editor_plugin.cpp
View file @
ebb6eb8b
...
...
@@ -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
(
M
argin
::
M
ARGIN_LEFT
);
box_size
.
x
-=
text_box
->
get_margin
(
MARGIN_LEFT
);
box_size
.
x
-=
28
*
EDSCALE
;
box_size
.
y
-=
text_box
->
get_margin
(
M
argin
::
M
ARGIN_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
));
...
...
scene/resources/visual_shader.cpp
View file @
ebb6eb8b
...
...
@@ -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
(
")"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment