diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-05 09:04:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-05 09:04:17 +0100 |
| commit | b57b2447be2c01516342ae72a77efb012f96f021 (patch) | |
| tree | bd49aaf8a2063064dd76bcd4af20a91fd231e979 /servers/rendering/renderer_rd | |
| parent | 026de65e5ffadb02067e2b80c20f39f888ad0904 (diff) | |
| parent | 679fe92bb3046e75c3096c332982bc7aff962235 (diff) | |
Merge pull request #56505 from bruvzg/bone_weight_fixes
Fix incorrect format and buffer used for bone weights.
Diffstat (limited to 'servers/rendering/renderer_rd')
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_storage_rd.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp b/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp index 75593003f1..da75c70cbb 100644 --- a/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp @@ -281,7 +281,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve vd.stride = 0; descriptions.write[4] = vd; - buffers.write[4] = storage->mesh_get_default_rd_buffer(RendererStorageRD::DEFAULT_RD_BUFFER_BONES); + buffers.write[4] = storage->mesh_get_default_rd_buffer(RendererStorageRD::DEFAULT_RD_BUFFER_WEIGHTS); } //check that everything is as it should be diff --git a/servers/rendering/renderer_rd/renderer_storage_rd.cpp b/servers/rendering/renderer_rd/renderer_storage_rd.cpp index 587ed4cad9..6cce51cfaf 100644 --- a/servers/rendering/renderer_rd/renderer_storage_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_storage_rd.cpp @@ -3878,7 +3878,7 @@ void RendererStorageRD::_mesh_surface_generate_version_for_input_mask(Mesh::Surf } break; case RS::ARRAY_WEIGHTS: { //assumed weights too - vd.format = RD::DATA_FORMAT_R32G32B32A32_UINT; + vd.format = RD::DATA_FORMAT_R32G32B32A32_SFLOAT; } break; } } else { |