diff options
author | Geoffrey Bantle <hairbat@yahoo.com> | 2006-05-11 00:34:45 +0400 |
---|---|---|
committer | Geoffrey Bantle <hairbat@yahoo.com> | 2006-05-11 00:34:45 +0400 |
commit | 6e047236c3c2299d55c77e14d8e0c15a6ea7037d (patch) | |
tree | 1fd570fbe8bd5305d7330c9225bb65fcaa34d37e /source/blender/src/editmesh_tools.c | |
parent | d5ae204275becc4915e24aa1bb38cbb1404429e7 (diff) |
-> Fix for Bug #4181
Silly typo in a call to memcpy was leading to crashes when doing remove doubles with vertex weights (whoops!) Fixed now.
Diffstat (limited to 'source/blender/src/editmesh_tools.c')
-rw-r--r-- | source/blender/src/editmesh_tools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index e0820306895..ef23273f7d4 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -282,8 +282,8 @@ int removedoublesflag(short flag, float limit) /* return amount */ v1 = eve->tmp.v; + if(v1->dw && eve->dw){ - for(doubweight=0; doubweight < eve->totweight; doubweight++){ targetweight = -1; for(currweight = 0; currweight < v1->totweight; currweight++){ @@ -298,7 +298,7 @@ int removedoublesflag(short flag, float limit) /* return amount */ } else{ /*append*/ newdw = MEM_callocN(sizeof(MDeformWeight)*(v1->totweight+1), "MDeformWeight Append"); - memcpy(newdw, v1->dw, sizeof(MDeformVert)*v1->totweight); + memcpy(newdw, v1->dw, sizeof(MDeformWeight)*v1->totweight); MEM_freeN(v1->dw); v1->dw= newdw; |