diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-10 13:06:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-10 13:06:55 +0200 |
commit | 9cc67b19b8803adf3cb12364f1e3faade7553ebb (patch) | |
tree | e4741393cf3a0dd288bc2096c97471ea595340b0 /core/variant_op.cpp | |
parent | 2d8d311b1280c78e1ae70900186d5ae22a488828 (diff) | |
parent | ec7b481170dcd6a7b4cf0e6c1221e204ff7945f3 (diff) | |
download | redot-engine-9cc67b19b8803adf3cb12364f1e3faade7553ebb.tar.gz |
Merge pull request #38613 from MCrafterzz/plane
Renamed plane's d to distance
Diffstat (limited to 'core/variant_op.cpp')
-rw-r--r-- | core/variant_op.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 27624b81ee..8cc07539a9 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -1550,7 +1550,7 @@ void Variant::set_named(const StringName &p_index, const Variant &p_value, bool v->normal.z = p_value._data._int; valid = true; } else if (p_index == CoreStringNames::singleton->d) { - v->d = p_value._data._int; + v->distance = p_value._data._int; valid = true; } } else if (p_value.type == Variant::FLOAT) { @@ -1565,7 +1565,7 @@ void Variant::set_named(const StringName &p_index, const Variant &p_value, bool v->normal.z = p_value._data._float; valid = true; } else if (p_index == CoreStringNames::singleton->d) { - v->d = p_value._data._float; + v->distance = p_value._data._float; valid = true; } @@ -1851,7 +1851,7 @@ Variant Variant::get_named(const StringName &p_index, bool *r_valid) const { } else if (p_index == CoreStringNames::singleton->z) { return v->normal.z; } else if (p_index == CoreStringNames::singleton->d) { - return v->d; + return v->distance; } else if (p_index == CoreStringNames::singleton->normal) { return v->normal; } @@ -2334,7 +2334,7 @@ void Variant::set(const Variant &p_index, const Variant &p_value, bool *r_valid) return; } else if (*str == "d") { valid = true; - v->d = p_value; + v->distance = p_value; return; } } @@ -2841,7 +2841,7 @@ Variant Variant::get(const Variant &p_index, bool *r_valid) const { return v->normal; } else if (*str == "d") { valid = true; - return v->d; + return v->distance; } } |