diff options
| author | reduz <reduzio@gmail.com> | 2022-02-08 13:38:19 +0100 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2022-02-08 13:50:01 +0100 |
| commit | db43237c787b0ab0a57e5366392aaa57af628309 (patch) | |
| tree | ee2916b690b480c31de313cb740ce9331c6fbd1d /servers | |
| parent | 561fbe21751806ddec84311e4fed7943e241cd25 (diff) | |
Fix BLEND_SHAPE_MASK
* Should now be correct
* Supersedes 53738
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/rendering_server.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering_server.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index 584abbc351..ac181cb5eb 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -933,7 +933,7 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(SurfaceData *r_surfa } } - ERR_FAIL_COND_V_MSG((bsformat & RS::ARRAY_FORMAT_BLEND_SHAPE_MASK) != (format & RS::ARRAY_FORMAT_BLEND_SHAPE_MASK), ERR_INVALID_PARAMETER, "Blend shape format must match the main array format for Vertex, Normal and Tangent arrays."); + ERR_FAIL_COND_V_MSG(bsformat != (format & RS::ARRAY_FORMAT_BLEND_SHAPE_MASK), ERR_INVALID_PARAMETER, "Blend shape format must match the main array format for Vertex, Normal and Tangent arrays."); } } diff --git a/servers/rendering_server.h b/servers/rendering_server.h index 472fff1bf1..d21f3a3299 100644 --- a/servers/rendering_server.h +++ b/servers/rendering_server.h @@ -259,7 +259,7 @@ public: ARRAY_FORMAT_WEIGHTS = 1 << ARRAY_WEIGHTS, ARRAY_FORMAT_INDEX = 1 << ARRAY_INDEX, - ARRAY_FORMAT_BLEND_SHAPE_MASK = (~(ARRAY_FORMAT_COLOR | ARRAY_FORMAT_TEX_UV | ARRAY_FORMAT_TEX_UV2 | ARRAY_FORMAT_BONES | ARRAY_FORMAT_WEIGHTS | ARRAY_FORMAT_CUSTOM0 | ARRAY_FORMAT_CUSTOM1 | ARRAY_FORMAT_CUSTOM2 | ARRAY_FORMAT_CUSTOM3 | ARRAY_FORMAT_INDEX)) & 0x7FFFFFFF, + ARRAY_FORMAT_BLEND_SHAPE_MASK = ARRAY_FORMAT_VERTEX | ARRAY_FORMAT_NORMAL | ARRAY_FORMAT_TANGENT, ARRAY_FORMAT_CUSTOM_BASE = (ARRAY_INDEX + 1), ARRAY_FORMAT_CUSTOM_BITS = 3, |