diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-13 06:21:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-13 06:21:27 +0300 |
| commit | 867fc4b463ef39ea16103f18f332c3d259624d29 (patch) | |
| tree | 7d20c416241afb7b878b767a9955e284d3cddbe2 /source/blender/modifiers/intern/MOD_collision.c | |
| parent | 9e03a0d4762b4734fe7ccb20e03b4a3c8f939620 (diff) | |
enforce string limits (reported by pedantic checking tools & some developers).
mostly replace strcpy with BLI_strncpy and multiple strcat's with a BLI_snprintf().
also fix possible crash if CWD isnt available.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_collision.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 8decb460d6a..bdc0f0ea2e9 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -110,8 +110,6 @@ static void deformVerts(ModifierData *md, Object *ob, { CollisionModifierData *collmd = (CollisionModifierData*) md; DerivedMesh *dm = NULL; - float current_time = 0; - unsigned int numverts = 0, i = 0; MVert *tempVert = NULL; /* if possible use/create DerivedMesh */ @@ -126,6 +124,9 @@ static void deformVerts(ModifierData *md, Object *ob, if(dm) { + float current_time = 0; + unsigned int numverts = 0; + CDDM_apply_vert_coords(dm, vertexCos); CDDM_calc_normals(dm); @@ -137,7 +138,9 @@ static void deformVerts(ModifierData *md, Object *ob, numverts = dm->getNumVerts ( dm ); if((current_time > collmd->time)|| (BKE_ptcache_get_continue_physics())) - { + { + unsigned int i; + // check if mesh has changed if(collmd->x && (numverts != collmd->numverts)) freeData((ModifierData *)collmd); |