浏览代码

Merge pull request #22934 from SeleckyErik/issue-11457

GDscript function str2var now returns null on invalid input
Rémi Verschelde 6 年之前
父节点
当前提交
19f2a188bb
共有 1 个文件被更改,包括 2 次插入10 次删除
  1. 2 10
      modules/gdscript/gdscript_functions.cpp

+ 2 - 10
modules/gdscript/gdscript_functions.cpp

@@ -758,22 +758,14 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 				r_ret = Variant();
 				return;
 			}
+			r_ret = *p_args[0];
 
 			VariantParser::StreamString ss;
 			ss.s = *p_args[0];
 
 			String errs;
 			int line;
-			Error err = VariantParser::parse(&ss, r_ret, errs, line);
-
-			if (err != OK) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-				r_error.argument = 0;
-				r_error.expected = Variant::STRING;
-				r_ret = "Parse error at line " + itos(line) + ": " + errs;
-				return;
-			}
-
+			(void)VariantParser::parse(&ss, r_ret, errs, line);
 		} break;
 		case VAR_TO_BYTES: {
 			VALIDATE_ARG_COUNT(1);