archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T38100: laplacian smooth crash

Browse Source
This commit is contained in:
Campbell Barton
2014-01-08 03:44:00 +11:00
parent d2fd8c75b0
commit d490e686f0
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/modifiers/intern/MOD_laplaciansmooth.c
View File

@@ -677,7 +677,12 @@ static CustomDataMask required_data_mask(Object *UNUSED(ob), ModifierData *md)
static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
float (*vertexCos)[3], int numVerts, ModifierApplyFlag UNUSED(flag)) float (*vertexCos)[3], int numVerts, ModifierApplyFlag UNUSED(flag))
{ {
DerivedMesh *dm = get_dm(ob, NULL, derivedData, NULL, false, false); DerivedMesh *dm;
if (numVerts == 0)
return;
dm = get_dm(ob, NULL, derivedData, NULL, false, false);
laplaciansmoothModifier_do((LaplacianSmoothModifierData *)md, ob, dm, laplaciansmoothModifier_do((LaplacianSmoothModifierData *)md, ob, dm,
vertexCos, numVerts); vertexCos, numVerts);
@@ -690,7 +695,12 @@ static void deformVertsEM(
ModifierData *md, Object *ob, struct BMEditMesh *editData, ModifierData *md, Object *ob, struct BMEditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm = get_dm(ob, editData, derivedData, NULL, false, false); DerivedMesh *dm;
if (numVerts == 0)
return;
dm = get_dm(ob, editData, derivedData, NULL, false, false);
laplaciansmoothModifier_do((LaplacianSmoothModifierData *)md, ob, dm, laplaciansmoothModifier_do((LaplacianSmoothModifierData *)md, ob, dm,
vertexCos, numVerts); vertexCos, numVerts);