summaryrefslogtreecommitdiff
path: root/servers/rendering_server.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-10-04 15:52:24 +0200
committerGitHub <noreply@github.com>2021-10-04 15:52:24 +0200
commit2a09e119864432b0074941eb7eba802c08faa72a (patch)
treec2b51794dadd76419315adf71108821940708af0 /servers/rendering_server.cpp
parent1a86c7ab134fc5c6db30ed0c9092353973febff7 (diff)
parent1463fc889b65524794f2f7d9cf661aa673d58e06 (diff)
Merge pull request #52802 from V-Sekai/gltf-extensions
Diffstat (limited to 'servers/rendering_server.cpp')
-rw-r--r--servers/rendering_server.cpp2
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.");
}
}