diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-20 12:07:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 12:07:14 +0100 |
| commit | e241057a98ab2c684f4174f6b3dab78b3446b470 (patch) | |
| tree | c9b37e7d18e060d5f1ac933217a02d9b96d75eda /servers | |
| parent | 2db8f40bd7323dc89e25e2a43dcd95009332dac3 (diff) | |
| parent | ba6d9597cbbfe539e03b37f703090b98f0eab2b8 (diff) | |
Merge pull request #34487 from supagu/instance_mesh_colours_fix
Fixed error condition check for multimesh instance colors
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp index 58b4205b38..2d4675cfb3 100644 --- a/servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp @@ -2616,7 +2616,7 @@ void RasterizerStorageRD::multimesh_instance_set_color(RID p_multimesh, int p_in MultiMesh *multimesh = multimesh_owner.getornull(p_multimesh); ERR_FAIL_COND(!multimesh); ERR_FAIL_INDEX(p_index, multimesh->instances); - ERR_FAIL_INDEX(p_index, !multimesh->uses_colors); + ERR_FAIL_COND(!multimesh->uses_colors); _multimesh_make_local(multimesh); |