Skip to content

Commit be033d2

Browse files
committed
revert changes to unrelated files
1 parent 926b929 commit be033d2

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

modules/gdscript/tests/scripts/runtime/features/gdscript_utility_implicit_conversion.gd

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,3 @@ func test():
1010
var string_name := &"Node"
1111
print(type_exists(string))
1212
print(type_exists(string_name))
13-
const COLOR2 = Color.from_rgba8(255, 0.0, false)
14-
@warning_ignore("narrowing_conversion")
15-
var color2 = Color.from_rgba8(255, 0.0, false_value)
16-
print(var_to_str(COLOR2))
17-
print(var_to_str(color2))
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
GDTEST_ANALYZER_ERROR
2-
>> ERROR at line 13: Assigned value for constant "COLOR2" isn't a constant expression.
1+
GDTEST_OK
2+
Color(1, 0, 0, 1)
3+
Color(1, 0, 0, 1)
4+
true
5+
true

tests/python_build/fixtures/gles3/vertex_fragment.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ protected:
3030
R"<!>(
3131
precision highp float;
3232
precision highp int;
33-
/* clang-format on */
33+
3434
layout(location = 0) in highp vec3 vertex;
3535

3636
out highp vec4 position_interp;
3737

3838
void main() {
39-
position_interp = vec4(vertex.x, 1, 0, 1);
39+
position_interp = vec4(vertex.x,1,0,1);
4040
}
4141

4242
)<!>"

tests/python_build/fixtures/glsl/compute.out

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ R"<!>(#[compute]
55

66
#VERSION_DEFINES
77

8+
89
#define M_PI 3.14159265359
910

1011
void main() {

tests/python_build/fixtures/glsl/vertex_fragment.out

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ lines = "#define MODE_LINES";
1212
layout(location = 0) out vec3 uv_interp;
1313

1414
void main() {
15+
1516
#ifdef MODE_LINES
16-
uv_interp = vec3(0, 0, 1);
17+
uv_interp = vec3(0,0,1);
1718
#endif
1819
}
1920

@@ -28,7 +29,7 @@ void main() {
2829
layout(location = 0) out vec4 dst_color;
2930

3031
void main() {
31-
dst_color = vec4(1, 1, 0, 0);
32+
dst_color = vec4(1,1,0,0);
3233
}
3334
)<!>"
3435
};

0 commit comments

Comments
 (0)