diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-10 17:39:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 17:39:53 +0100 |
| commit | 1808f1d76d51b67513c0cd864444f20ecf808601 (patch) | |
| tree | 19bf66787e48cebd86b494846d147db1f163f87c /scene/resources | |
| parent | f3d15771bf33e68b26058806f9310ac074c56e5c (diff) | |
| parent | 8b19ffd810a1471ab870b7229047ad2101341330 (diff) | |
Merge pull request #45852 from reduz/make-servers-truly-thread-safe
Make Servers truly Thread Safe
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/multimesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp index 050e398ca4..e8e159921c 100644 --- a/scene/resources/multimesh.cpp +++ b/scene/resources/multimesh.cpp @@ -217,7 +217,7 @@ Ref<Mesh> MultiMesh::get_mesh() const { void MultiMesh::set_instance_count(int p_count) { ERR_FAIL_COND(p_count < 0); - RenderingServer::get_singleton()->multimesh_allocate(multimesh, p_count, RS::MultimeshTransformFormat(transform_format), use_colors, use_custom_data); + RenderingServer::get_singleton()->multimesh_allocate_data(multimesh, p_count, RS::MultimeshTransformFormat(transform_format), use_colors, use_custom_data); instance_count = p_count; } |