godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 19:41:11 +00:00
Code Releases Wiki Activity

Merge pull request #44661 from AndreaCatania/AndreaCatania-patch-5

Browse Source 
Fixes: GDscript min and max are inverted
This commit is contained in:
Rémi Verschelde
2021-01-05 13:42:08 +01:00
committed by GitHub
parent 20b3ed07b9 7c6506e028
commit eea3287c2d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/variant/variant_utility.cpp
View File

@@ -291,7 +291,7 @@ struct VariantUtilityFunctions {
Variant ret; Variant ret;
for (int i = 1; i < p_argcount; i++) { for (int i = 1; i < p_argcount; i++) {
bool valid; bool valid;
Variant::evaluate(Variant::OP_GREATER, base, *p_args[i], ret, valid); Variant::evaluate(Variant::OP_LESS, base, *p_args[i], ret, valid);
if (!valid) { if (!valid) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.expected = base.get_type(); r_error.expected = base.get_type();
@@ -324,7 +324,7 @@ struct VariantUtilityFunctions {
Variant ret; Variant ret;
for (int i = 1; i < p_argcount; i++) { for (int i = 1; i < p_argcount; i++) {
bool valid; bool valid;
Variant::evaluate(Variant::OP_LESS, base, *p_args[i], ret, valid); Variant::evaluate(Variant::OP_GREATER, base, *p_args[i], ret, valid);
if (!valid) { if (!valid) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.expected = base.get_type(); r_error.expected = base.get_type();