diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-29 10:59:18 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-29 10:59:18 +0400 |
| commit | 3be303aa3e08c082a9963802137ebb4fd7922953 (patch) | |
| tree | ef92012749acb4c2fdba2c161f828970898acdd3 /source/blender/blenkernel | |
| parent | 2cdb79239bdec497781baf7fe8309cf4b1a36308 (diff) | |
corrections for redundant null checks & transform printing a string into its self.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 5b583720905..5ec4c36177f 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3030,7 +3030,7 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra) psys->totcached = totpart; - if(psys && psys->lattice){ + if(psys->lattice){ end_latt_deform(psys->lattice); psys->lattice= NULL; } diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 179aab064b4..a7dd98ff404 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1382,7 +1382,7 @@ static void ptcache_find_frames_around(PTCacheID *pid, unsigned int frame, int * } } - if(pm && !pm2) { + if(!pm2) { *fra1 = 0; *fra2 = pm->frame; } @@ -1844,7 +1844,8 @@ static int ptcache_write(PTCacheID *pid, int cfra, int overwrite) if(cache->flag & PTCACHE_DISK_CACHE) { error += !ptcache_mem_frame_to_disk(pid, pm); - if(pm) { + // if(pm) /* pm is always set */ + { ptcache_data_free(pm); ptcache_extra_free(pm); MEM_freeN(pm); |