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

Merge pull request #66752 from timothyqiu/array-size 

[3.x] Fix crash executing `MultiMesh.reset_instance_physics_interpolation`
This commit is contained in:
Clay John 2022-10-02 22:19:02 -06:00 committed by GitHub
parent cbde08d452 f33dfe8236
commit 217387ae7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/visual/rasterizer.cpp
View File

@ -505,6 +505,9 @@ void RasterizerStorage::_multimesh_add_to_interpolation_lists(RID p_multimesh, M
void RasterizerStorage::multimesh_set_as_bulk_array_interpolated(RID p_multimesh, const PoolVector<float> &p_array, const PoolVector<float> &p_array_prev) { void RasterizerStorage::multimesh_set_as_bulk_array_interpolated(RID p_multimesh, const PoolVector<float> &p_array, const PoolVector<float> &p_array_prev) {
MMInterpolator *mmi = _multimesh_get_interpolator(p_multimesh); MMInterpolator *mmi = _multimesh_get_interpolator(p_multimesh);
if (mmi) { if (mmi) {
ERR_FAIL_COND_MSG(p_array.size() != mmi->_data_curr.size(), vformat("Array for current frame should have %d elements, got %d instead.", mmi->_data_curr.size(), p_array.size()));
ERR_FAIL_COND_MSG(p_array_prev.size() != mmi->_data_prev.size(), vformat("Array for previous frame should have %d elements, got %d instead.", mmi->_data_prev.size(), p_array_prev.size()));
// We are assuming that mmi->interpolated is the case, // We are assuming that mmi->interpolated is the case,
// (can possibly assert this?) // (can possibly assert this?)
// even if this flag hasn't been set - just calling this function suggests // even if this flag hasn't been set - just calling this function suggests
@ -528,6 +531,8 @@ void RasterizerStorage::multimesh_set_as_bulk_array(RID p_multimesh, const PoolV
MMInterpolator *mmi = _multimesh_get_interpolator(p_multimesh); MMInterpolator *mmi = _multimesh_get_interpolator(p_multimesh);
if (mmi) { if (mmi) {
if (mmi->interpolated) { if (mmi->interpolated) {
ERR_FAIL_COND_MSG(p_array.size() != mmi->_data_curr.size(), vformat("Array should have %d elements, got %d instead.", mmi->_data_curr.size(), p_array.size()));
mmi->_data_curr = p_array; mmi->_data_curr = p_array;
_multimesh_add_to_interpolation_lists(p_multimesh, *mmi); _multimesh_add_to_interpolation_lists(p_multimesh, *mmi);
#if defined(DEBUG_ENABLED) && defined(TOOLS_ENABLED) #if defined(DEBUG_ENABLED) && defined(TOOLS_ENABLED)