diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-10 09:56:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-10 09:56:27 +0200 |
| commit | 483bbd6eccffeb12bde6c6bcb7669222e6d20a29 (patch) | |
| tree | b767c3cace2ea198c03fbdc05e1d4e5a0507840d | |
| parent | 51b4df72a7d67b442cbb1a2db1610853895971de (diff) | |
| parent | 0eca908e8610d7eb71b8200d9e9df83bae6f3e49 (diff) | |
Merge pull request #51464 from hpnrep6/mesh-disable-deprecated
Enclose deprecated components with `DISABLE_DEPRECATED` in Mesh
| -rw-r--r-- | scene/resources/mesh.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index 2f92872ad5..ad589a605e 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -653,6 +653,7 @@ enum OldArrayFormat { }; +#ifndef DISABLE_DEPRECATED static Array _convert_old_array(const Array &p_old) { Array new_array; new_array.resize(Mesh::ARRAY_MAX); @@ -677,6 +678,7 @@ static Mesh::PrimitiveType _old_primitives[7] = { Mesh::PRIMITIVE_TRIANGLE_STRIP, Mesh::PRIMITIVE_TRIANGLE_STRIP }; +#endif // DISABLE_DEPRECATED void _fix_array_compatibility(const Vector<uint8_t> &p_src, uint32_t p_old_format, uint32_t p_new_format, uint32_t p_elements, Vector<uint8_t> &vertex_data, Vector<uint8_t> &attribute_data, Vector<uint8_t> &skin_data) { uint32_t dst_vertex_stride; |