diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-03 19:36:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 19:36:07 +0200 |
| commit | 1b2992799b324479b3fba9e05ae6226a46cb4143 (patch) | |
| tree | dec0fb56da26538c10fb41824715c357b917e296 /core/variant | |
| parent | 7d2e38d709834b3b880f9d17b591147b7976974a (diff) | |
| parent | fa7a7795f09688b1c71ddad40243e46909989054 (diff) | |
| download | redot-engine-1b2992799b324479b3fba9e05ae6226a46cb4143.tar.gz | |
Merge pull request #60727 from aaronfranke/basis-axis-column
Diffstat (limited to 'core/variant')
| -rw-r--r-- | core/variant/variant_setget.cpp | 2 | ||||
| -rw-r--r-- | core/variant/variant_setget.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/variant/variant_setget.cpp b/core/variant/variant_setget.cpp index 09097e30e0..6023e4d129 100644 --- a/core/variant/variant_setget.cpp +++ b/core/variant/variant_setget.cpp @@ -790,7 +790,7 @@ INDEXED_SETGET_STRUCT_BULTIN_NUMERIC(Quaternion, double, real_t, 4) INDEXED_SETGET_STRUCT_BULTIN_NUMERIC(Color, double, float, 4) INDEXED_SETGET_STRUCT_BULTIN_ACCESSOR(Transform2D, Vector2, .columns, 3) -INDEXED_SETGET_STRUCT_BULTIN_FUNC(Basis, Vector3, set_axis, get_axis, 3) +INDEXED_SETGET_STRUCT_BULTIN_FUNC(Basis, Vector3, set_column, get_column, 3) INDEXED_SETGET_STRUCT_TYPED_NUMERIC(PackedByteArray, int64_t, uint8_t) INDEXED_SETGET_STRUCT_TYPED_NUMERIC(PackedInt32Array, int64_t, int32_t) diff --git a/core/variant/variant_setget.h b/core/variant/variant_setget.h index 2083e64125..3b95f0531b 100644 --- a/core/variant/variant_setget.h +++ b/core/variant/variant_setget.h @@ -308,9 +308,9 @@ SETGET_NUMBER_STRUCT(Quaternion, double, y) SETGET_NUMBER_STRUCT(Quaternion, double, z) SETGET_NUMBER_STRUCT(Quaternion, double, w) -SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, x, set_axis, get_axis, 0) -SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, y, set_axis, get_axis, 1) -SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, z, set_axis, get_axis, 2) +SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, x, set_column, get_column, 0) +SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, y, set_column, get_column, 1) +SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, z, set_column, get_column, 2) SETGET_STRUCT(Transform3D, Basis, basis) SETGET_STRUCT(Transform3D, Vector3, origin) |