diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-07 11:57:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 11:57:47 +0200 |
| commit | d567abd714f25afabf29673383697f1cf3b37329 (patch) | |
| tree | c32470c634aa27ec1c7abf296ee5af22f8626ce9 /scene | |
| parent | 76ec21707ea39cc83537fc98250387972b432bb7 (diff) | |
| parent | c1c76850cb47c0f8451fce6353958006e95b2cda (diff) | |
Merge pull request #49382 from akien-mga/misc-cleanup
Style: Cleanup uses of double spaces between words
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/grid_container.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/material.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp index 541925a802..a54f5eef06 100644 --- a/scene/gui/grid_container.cpp +++ b/scene/gui/grid_container.cpp @@ -33,7 +33,7 @@ void GridContainer::_notification(int p_what) { switch (p_what) { case NOTIFICATION_SORT_CHILDREN: { - Map<int, int> col_minw; // Max of min_width of all controls in each col (indexed by col). + Map<int, int> col_minw; // Max of min_width of all controls in each col (indexed by col). Map<int, int> row_minh; // Max of min_height of all controls in each row (indexed by row). Set<int> col_expanded; // Columns which have the SIZE_EXPAND flag set. Set<int> row_expanded; // Rows which have the SIZE_EXPAND flag set. diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 100fccc783..c2f33accee 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -891,7 +891,7 @@ void BaseMaterial3D::_update_shader() { code += "\t\tfloat current_layer_depth = 0.0;\n"; code += "\t\tvec2 P = view_dir.xy * heightmap_scale;\n"; code += "\t\tvec2 delta = P / num_layers;\n"; - code += "\t\tvec2 ofs = base_uv;\n"; + code += "\t\tvec2 ofs = base_uv;\n"; if (flags[FLAG_INVERT_HEIGHTMAP]) { code += "\t\tfloat depth = texture(texture_heightmap, ofs).r;\n"; } else { |