Skip to content

Commit

Permalink
Return correct mesh format for PrimitiveMesh.
Browse files Browse the repository at this point in the history
The return value was changed during the Vulkan port, but it didn't include ARRAY_FORMAT_INDEX. This meant they were wrongly considered non-indexed meshes and the click-selection logic for all primitive meshes broke.
  • Loading branch information
JFonS committed Mar 10, 2020
1 parent 002d821 commit 9f2f7ee
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scene/resources/primitive_meshes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 9f2f7ee

Please sign in to comment.