Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-02-12 12:09:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-02-12 12:09:52 +0300
commit5af9e5fda96bbf47ebf6bb5cfdd6b67bcbb365cb (patch)
treefa3ee54a8e2f344013870983f4e308f53c3ea999 /source/blender/blenloader
parente70ca00f71c8f6f3be218e9113b714df25e33deb (diff)
- resource leak in pointcache, opendir without closedir()
- reading pointcache was using an incorrect, always NULL variable. - commented NDof code, was giving warnings and isnt used now.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index dfd586fdb9a..6f22b1ad6f2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2981,9 +2981,8 @@ static void direct_link_pointcache(FileData *fd, PointCache *cache)
static void direct_link_pointcache_list(FileData *fd, ListBase *ptcaches, PointCache **ocache, int force_disk)
{
- PointCache *cache= NULL;
-
if(ptcaches->first) {
+ PointCache *cache= NULL;
link_list(fd, ptcaches);
for(cache=ptcaches->first; cache; cache=cache->next) {
direct_link_pointcache(fd, cache);
@@ -3001,7 +3000,7 @@ static void direct_link_pointcache_list(FileData *fd, ListBase *ptcaches, PointC
direct_link_pointcache(fd, *ocache);
if(force_disk) {
(*ocache)->flag |= PTCACHE_DISK_CACHE;
- cache->step = 1;
+ (*ocache)->step = 1;
}
ptcaches->first = ptcaches->last = *ocache;