Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T38941: Laplacian Deform crashes on OSX

Browse Source 
When vgroup was invalid somehow (e.g. empty, as in this case) and bind could not happen, code was dereferencing a NULL pointer...
This commit is contained in:
Bastien Montagne
2014-03-04 09:09:38 +01:00
parent 13290d5a16
commit dad9600004
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/modifiers/intern/MOD_laplaciandeform.c
View File

@@ -755,27 +755,27 @@ static void LaplacianDeformModifier_do(
} }
} }
else { else {
if (lmd->total_verts > 0 && lmd->total_verts == numVerts) { if (!isValidVertexGroup(lmd, ob, dm)) {
if (isValidVertexGroup(lmd, ob, dm)) { modifier_setError(&lmd->modifier, "Vertex group '%s' is not valid", lmd->anchor_grp_name);
filevertexCos = MEM_mallocN(sizeof(float[3]) * numVerts, "TempDeformCoordinates"); lmd->flag &= ~MOD_LAPLACIANDEFORM_BIND;
memcpy(filevertexCos, lmd->vertexco, sizeof(float[3]) * numVerts); }
MEM_SAFE_FREE(lmd->vertexco); else if (lmd->total_verts > 0 && lmd->total_verts == numVerts) {
lmd->total_verts = 0; filevertexCos = MEM_mallocN(sizeof(float[3]) * numVerts, "TempDeformCoordinates");
initSystem(lmd, ob, dm, filevertexCos, numVerts); memcpy(filevertexCos, lmd->vertexco, sizeof(float[3]) * numVerts);
sys = lmd->cache_system; MEM_SAFE_FREE(lmd->vertexco);
MEM_SAFE_FREE(filevertexCos); lmd->total_verts = 0;
laplacianDeformPreview(sys, vertexCos); initSystem(lmd, ob, dm, filevertexCos, numVerts);
} sys = lmd->cache_system;
MEM_SAFE_FREE(filevertexCos);
laplacianDeformPreview(sys, vertexCos);
} }
else { else {
if (isValidVertexGroup(lmd, ob, dm)) { initSystem(lmd, ob, dm, vertexCos, numVerts);
initSystem(lmd, ob, dm, vertexCos, numVerts); sys = lmd->cache_system;
sys = lmd->cache_system; laplacianDeformPreview(sys, vertexCos);
laplacianDeformPreview(sys, vertexCos);
}
} }
} }
if (sys->is_matrix_computed && !sys->has_solution) { if (sys && sys->is_matrix_computed && !sys->has_solution) {
modifier_setError(&lmd->modifier, "The system did not find a solution"); modifier_setError(&lmd->modifier, "The system did not find a solution");
} }
} }