Explorar el Código

Merge pull request #51464 from hpnrep6/mesh-disable-deprecated

Enclose deprecated components with `DISABLE_DEPRECATED` in Mesh
Rémi Verschelde hace 4 años
padre
commit
483bbd6ecc
Se han modificado 1 ficheros con 2 adiciones y 0 borrados
  1. 2 0
      scene/resources/mesh.cpp

+ 2 - 0
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;