diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-03-12 12:35:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-12 12:35:56 +0100 |
commit | 3c376a898ae6f4b6332d732d29c44d090978b887 (patch) | |
tree | 166c577496476060e7ec9daf49419f9486e218b3 /scene/resources | |
parent | 676fcca9883551d42b6c9136b675fa3cee5ee333 (diff) | |
parent | 9f2f7ee5eb59bf26e74edb3565f352f12b685963 (diff) |
Merge pull request #36961 from JFonS/fix_mesh_selection
Return correct mesh format for PrimitiveMesh
Diffstat (limited to 'scene/resources')
-rw-r--r-- | scene/resources/primitive_meshes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 00fc016ca1..959ee214a2 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -150,7 +150,7 @@ Array PrimitiveMesh::surface_get_blend_shape_arrays(int p_surface) const { uint32_t PrimitiveMesh::surface_get_format(int p_idx) const { ERR_FAIL_INDEX_V(p_idx, 1, 0); - return VS::ARRAY_COMPRESS_DEFAULT; + return VS::ARRAY_FORMAT_VERTEX | VS::ARRAY_FORMAT_NORMAL | VS::ARRAY_FORMAT_TANGENT | VS::ARRAY_FORMAT_TEX_UV | VS::ARRAY_FORMAT_INDEX | VS::ARRAY_COMPRESS_DEFAULT; } Mesh::PrimitiveType PrimitiveMesh::surface_get_primitive_type(int p_idx) const { |