diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_surface.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_surface.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index ccb6e79eb64..86e11aca5b7 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -61,18 +61,18 @@ static void freeData(ModifierData *md) SurfaceModifierData *surmd = (SurfaceModifierData*) md; if (surmd) { - if(surmd->bvhtree) { + if (surmd->bvhtree) { free_bvhtree_from_mesh(surmd->bvhtree); MEM_freeN(surmd->bvhtree); } - if(surmd->dm) + if (surmd->dm) surmd->dm->release(surmd->dm); - if(surmd->x) + if (surmd->x) MEM_freeN(surmd->x); - if(surmd->v) + if (surmd->v) MEM_freeN(surmd->v); surmd->bvhtree = NULL; @@ -94,11 +94,11 @@ static void deformVerts(ModifierData *md, Object *ob, { SurfaceModifierData *surmd = (SurfaceModifierData*) md; - if(surmd->dm) + if (surmd->dm) surmd->dm->release(surmd->dm); /* if possible use/create DerivedMesh */ - if(derivedData) surmd->dm = CDDM_copy(derivedData); + if (derivedData) surmd->dm = CDDM_copy(derivedData); else surmd->dm = get_dm(ob, NULL, NULL, NULL, 0); if (!ob->pd) { @@ -106,7 +106,7 @@ static void deformVerts(ModifierData *md, Object *ob, return; } - if(surmd->dm) { + if (surmd->dm) { unsigned int numverts = 0, i = 0; int init = 0; float *vec; @@ -117,12 +117,12 @@ static void deformVerts(ModifierData *md, Object *ob, numverts = surmd->dm->getNumVerts ( surmd->dm ); - if(numverts != surmd->numverts || surmd->x == NULL || surmd->v == NULL || md->scene->r.cfra != surmd->cfra+1) { - if(surmd->x) { + if (numverts != surmd->numverts || surmd->x == NULL || surmd->v == NULL || md->scene->r.cfra != surmd->cfra+1) { + if (surmd->x) { MEM_freeN(surmd->x); surmd->x = NULL; } - if(surmd->v) { + if (surmd->v) { MEM_freeN(surmd->v); surmd->v = NULL; } @@ -136,11 +136,11 @@ static void deformVerts(ModifierData *md, Object *ob, } /* convert to global coordinates and calculate velocity */ - for(i = 0, x = surmd->x, v = surmd->v; i<numverts; i++, x++, v++) { + for (i = 0, x = surmd->x, v = surmd->v; i<numverts; i++, x++, v++) { vec = CDDM_get_vert(surmd->dm, i)->co; mul_m4_v3(ob->obmat, vec); - if(init) + if (init) v->co[0] = v->co[1] = v->co[2] = 0.0f; else sub_v3_v3v3(v->co, vec, x->co); @@ -150,12 +150,12 @@ static void deformVerts(ModifierData *md, Object *ob, surmd->cfra = md->scene->r.cfra; - if(surmd->bvhtree) + if (surmd->bvhtree) free_bvhtree_from_mesh(surmd->bvhtree); else surmd->bvhtree = MEM_callocN(sizeof(BVHTreeFromMesh), "BVHTreeFromMesh"); - if(surmd->dm->getNumTessFaces(surmd->dm)) + if (surmd->dm->getNumTessFaces(surmd->dm)) bvhtree_from_mesh_faces(surmd->bvhtree, surmd->dm, 0.0, 2, 6); else bvhtree_from_mesh_edges(surmd->bvhtree, surmd->dm, 0.0, 2, 6); |