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.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.cpp')
| -rw-r--r-- | core/variant.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index a91876dd98..35c306f24b 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -3173,7 +3173,7 @@ uint32_t Variant::hash() const { uint32_t hash = hash_djb2_one_float(reinterpret_cast<const Plane *>(_data._mem)->normal.x); hash = hash_djb2_one_float(reinterpret_cast<const Plane *>(_data._mem)->normal.y, hash); hash = hash_djb2_one_float(reinterpret_cast<const Plane *>(_data._mem)->normal.z, hash); - return hash_djb2_one_float(reinterpret_cast<const Plane *>(_data._mem)->d, hash); + return hash_djb2_one_float(reinterpret_cast<const Plane *>(_data._mem)->distance, hash); } break; /* @@ -3521,7 +3521,7 @@ bool Variant::hash_compare(const Variant &p_variant) const { const Plane *r = reinterpret_cast<const Plane *>(p_variant._data._mem); return (hash_compare_vector3(l->normal, r->normal)) && - (hash_compare_scalar(l->d, r->d)); + (hash_compare_scalar(l->distance, r->distance)); } break; case AABB: { |