diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-25 16:51:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 16:51:09 +0200 |
| commit | df4de306a9c20cf4d4e87c89b448ac71f7a31444 (patch) | |
| tree | ebc25ce870c8324c9876f8d5ba011066bdde55f8 | |
| parent | e246d08c525df7b64eff3b0501c49a0f2e5edb97 (diff) | |
| parent | fb6aaacaedfc5d2c17b25a6a54c08f5837ac141b (diff) | |
Merge pull request #60490 from aaronfranke/dap-typo
| -rw-r--r-- | doc/classes/Vector3i.xml | 2 | ||||
| -rw-r--r-- | editor/debugger/debug_adapter/debug_adapter_protocol.cpp | 8 | ||||
| -rw-r--r-- | editor/editor_properties.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/classes/Vector3i.xml b/doc/classes/Vector3i.xml index a4c91a9299..ebb518792f 100644 --- a/doc/classes/Vector3i.xml +++ b/doc/classes/Vector3i.xml @@ -161,7 +161,7 @@ <description> Gets the remainder of each component of the [Vector3i] with the the given [int]. This operation uses truncated division, which is often not desired as it does not work well with negative numbers. Consider using [method @GlobalScope.posmod] instead if you want to handle negative numbers. [codeblock] - print(Vector2i(10, -20, 30) % 7) # Prints "(3, -6, 2)" + print(Vector3i(10, -20, 30) % 7) # Prints "(3, -6, 2)" [/codeblock] </description> </operator> diff --git a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp index babe8af8bc..745ca17efd 100644 --- a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp @@ -349,14 +349,14 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) { case Variant::BASIS: { int id = variable_id++; Basis basis = p_var; - const String type_vec2 = Variant::get_type_name(Variant::VECTOR2); + const String type_vec3 = Variant::get_type_name(Variant::VECTOR3); DAP::Variable x, y, z; x.name = "x"; y.name = "y"; z.name = "z"; - x.type = type_vec2; - y.type = type_vec2; - z.type = type_vec2; + x.type = type_vec3; + y.type = type_vec3; + z.type = type_vec3; x.value = basis.elements[0]; y.value = basis.elements[1]; z.value = basis.elements[2]; diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 44f168cd38..677d22cb62 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -2085,7 +2085,7 @@ EditorPropertyRect2i::EditorPropertyRect2i(bool p_force_wide) { } } -///////////////////// VECTOR3i ///////////////////////// +///////////////////// VECTOR3I ///////////////////////// void EditorPropertyVector3i::_set_read_only(bool p_read_only) { for (int i = 0; i < 3; i++) { @@ -2618,7 +2618,7 @@ EditorPropertyBasis::EditorPropertyBasis() { set_bottom_editor(g); } -///////////////////// TRANSFORM ///////////////////////// +///////////////////// TRANSFORM3D ///////////////////////// void EditorPropertyTransform3D::_set_read_only(bool p_read_only) { for (int i = 0; i < 12; i++) { |