[Bf-blender-cvs] [bfa78aceed7] master: Cleanup: remove paranoid 'MDeformVert.totweight < 0' check
Campbell Barton
noreply at git.blender.org
Sat Aug 29 02:57:10 CEST 2020
Commit: bfa78aceed7824e5a5cfcefe6d73d96dc12b0d99
Author: Campbell Barton
Date: Sat Aug 29 10:48:33 2020 +1000
Branches: master
https://developer.blender.org/rBbfa78aceed7824e5a5cfcefe6d73d96dc12b0d99
Cleanup: remove paranoid 'MDeformVert.totweight < 0' check
This was added in 1cb7267a9f9f1, however the behavior before this
would have failed on negative values already.
Also negative values here would fail in many other places.
===================================================================
M source/blender/blenkernel/intern/deform.c
===================================================================
diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index ea5e4ec6532..00fd30da4cd 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -1554,10 +1554,10 @@ void BKE_defvert_blend_read(BlendDataReader *reader, int count, MDeformVert *mdv
}
for (int i = count; i > 0; i--, mdverts++) {
- /*convert to vgroup allocation system*/
+ /* Convert to vertex group allocation system. */
MDeformWeight *dw;
if (mdverts->dw && (dw = BLO_read_get_new_data_address(reader, mdverts->dw))) {
- const size_t dw_len = MAX2(mdverts->totweight, 0) * sizeof(MDeformWeight);
+ const size_t dw_len = sizeof(MDeformWeight) * mdverts->totweight;
void *dw_tmp = MEM_mallocN(dw_len, __func__);
memcpy(dw_tmp, dw, dw_len);
mdverts->dw = dw_tmp;
More information about the Bf-blender-cvs
mailing list