diff options
| author | K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com> | 2021-09-20 18:24:31 -0700 |
|---|---|---|
| committer | K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com> | 2021-10-03 12:37:52 -0700 |
| commit | 1463fc889b65524794f2f7d9cf661aa673d58e06 (patch) | |
| tree | acd6a2a94a13d17b0d2beb7dc443159f998866d5 /servers/rendering_server.cpp | |
| parent | 84e4cfbcbe1054be4cdda34b891a2842e1cc6975 (diff) | |
| download | redot-engine-1463fc889b65524794f2f7d9cf661aa673d58e06.tar.gz | |
GLTF for game templates.
Convert GLTF Document to use ImporterMeshInstance3D.
Add a GLTFDocument extension list and an extension for converting the importer mesh instance 3d to mesh instance 3d.
Use GLTF module when the editor tools are disabled.
Modified the render server to be less restrictive on matching blend arrays and have more logging.
Misc bugs with multimesh.
Always index the meshes.
Diffstat (limited to 'servers/rendering_server.cpp')
| -rw-r--r-- | servers/rendering_server.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index 58e99f0e91..847f29f6ba 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -934,7 +934,7 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(SurfaceData *r_surfa } } - ERR_FAIL_COND_V((bsformat) != (format & (RS::ARRAY_FORMAT_INDEX - 1)), ERR_INVALID_PARAMETER); + ERR_FAIL_COND_V_MSG((bsformat) != (format & (ARRAY_FORMAT_VERTEX | ARRAY_FORMAT_NORMAL | ARRAY_FORMAT_TANGENT)), ERR_INVALID_PARAMETER, "Blend shape format must match the main array format for Vertex, Normal and Tangent arrays."); } } |