godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91372 from clayjohn/RS-blend-shape-tangent 

Enable tangents in blend shape format when using normals
This commit is contained in:
Rémi Verschelde 2024-05-01 09:55:24 +02:00
parent 0e0ef3cd69 e6f55a532a
commit 3ebef6ce7a
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/rendering_server.cpp
View File

@ -1226,6 +1226,10 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(SurfaceData *r_surfa
bsformat |= (1 << j); bsformat |= (1 << j);
} }
} }
if (bsformat & RS::ARRAY_FORMAT_NORMAL) {
// We must use tangents if using normals.
bsformat |= RS::ARRAY_FORMAT_TANGENT;
}
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."); 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.");
} }