mirror of
https://github.com/godotengine/godot.git
synced 2025-12-07 22:00:10 +00:00
Merge pull request #107295 from Ivorforce/explicit-math-to-string
Remove implicit conversions from math types to `String`, to avoid accidental conversions
This commit is contained in:
commit
7d5ecc2c6f
25 changed files with 55 additions and 55 deletions
|
|
@ -1610,41 +1610,41 @@ String Variant::stringify(int recursion_count) const {
|
|||
case STRING:
|
||||
return *reinterpret_cast<const String *>(_data._mem);
|
||||
case VECTOR2:
|
||||
return operator Vector2();
|
||||
return String(operator Vector2());
|
||||
case VECTOR2I:
|
||||
return operator Vector2i();
|
||||
return String(operator Vector2i());
|
||||
case RECT2:
|
||||
return operator Rect2();
|
||||
return String(operator Rect2());
|
||||
case RECT2I:
|
||||
return operator Rect2i();
|
||||
return String(operator Rect2i());
|
||||
case TRANSFORM2D:
|
||||
return operator Transform2D();
|
||||
return String(operator Transform2D());
|
||||
case VECTOR3:
|
||||
return operator Vector3();
|
||||
return String(operator Vector3());
|
||||
case VECTOR3I:
|
||||
return operator Vector3i();
|
||||
return String(operator Vector3i());
|
||||
case VECTOR4:
|
||||
return operator Vector4();
|
||||
return String(operator Vector4());
|
||||
case VECTOR4I:
|
||||
return operator Vector4i();
|
||||
return String(operator Vector4i());
|
||||
case PLANE:
|
||||
return operator Plane();
|
||||
return String(operator Plane());
|
||||
case AABB:
|
||||
return operator ::AABB();
|
||||
return String(operator ::AABB());
|
||||
case QUATERNION:
|
||||
return operator Quaternion();
|
||||
return String(operator Quaternion());
|
||||
case BASIS:
|
||||
return operator Basis();
|
||||
return String(operator Basis());
|
||||
case TRANSFORM3D:
|
||||
return operator Transform3D();
|
||||
return String(operator Transform3D());
|
||||
case PROJECTION:
|
||||
return operator Projection();
|
||||
return String(operator Projection());
|
||||
case STRING_NAME:
|
||||
return operator StringName();
|
||||
case NODE_PATH:
|
||||
return operator NodePath();
|
||||
case COLOR:
|
||||
return operator Color();
|
||||
return String(operator Color());
|
||||
case DICTIONARY: {
|
||||
ERR_FAIL_COND_V_MSG(recursion_count > MAX_RECURSION, "{ ... }", "Maximum dictionary recursion reached!");
|
||||
recursion_count++;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue