diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-07-27 22:17:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-27 22:17:19 +0400 |
commit | 0cb9a8311364edbc65fa207678341b88b986749d (patch) | |
tree | 5e22b7cfca599c3d9be1c055c99eb7215183dcbf | |
parent | 684c4cc40d75b07c2b23cc8ee6f1798c95942e44 (diff) |
code cleanup: remove unused code
-rw-r--r-- | source/blender/blenlib/intern/fileops.c | 10 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_cloth.c | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index af0359c0087..4809ba59aaf 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -911,18 +911,15 @@ void BLI_dir_create_recursive(const char *dirname) char static_buf[MAXPATHLEN]; #endif char *tmp; - int needs_free; if (BLI_exists(dirname)) return; #ifdef MAXPATHLEN size = MAXPATHLEN; tmp = static_buf; - needs_free = 0; #else size = strlen(dirname) + 1; - tmp = MEM_callocN(size, "BLI_dir_create_recursive tmp"); - needs_free = 1; + tmp = MEM_callocN(size, __func__); #endif BLI_strncpy(tmp, dirname, size); @@ -934,8 +931,9 @@ void BLI_dir_create_recursive(const char *dirname) BLI_dir_create_recursive(tmp); } - if (needs_free) - MEM_freeN(tmp); +#ifndef MAXPATHLEN + MEM_freeN(tmp); +#endif mkdir(dirname, 0777); } diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index ec3212d4cbb..81f139e48ce 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -72,7 +72,6 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, { DerivedMesh *dm; ClothModifierData *clmd = (ClothModifierData *) md; - DerivedMesh *result = NULL; /* check for alloc failing */ if (!clmd->sim_parms || !clmd->coll_parms) { @@ -92,11 +91,6 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, clothModifier_do(clmd, md->scene, ob, dm, vertexCos); - if (result) { - result->getVertCos(result, vertexCos); - result->release(result); - } - dm->release(dm); } |