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/io/marshalls.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/io/marshalls.cpp')
| -rw-r--r-- | core/io/marshalls.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 81bc45b2f7..1396683d25 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -277,7 +277,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int val.normal.x = decode_float(&buf[0]); val.normal.y = decode_float(&buf[4]); val.normal.z = decode_float(&buf[8]); - val.d = decode_float(&buf[12]); + val.distance = decode_float(&buf[12]); r_variant = val; if (r_len) @@ -1140,7 +1140,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo encode_float(p.normal.x, &buf[0]); encode_float(p.normal.y, &buf[4]); encode_float(p.normal.z, &buf[8]); - encode_float(p.d, &buf[12]); + encode_float(p.distance, &buf[12]); } r_len += 4 * 4; |