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-04-23 16:57:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-04-23 16:57:03 +0400
commitd6d2f09dd9e4df0a3e1168b2fbd3dcf2f9bd8e27 (patch)
tree1a6e80812e585fbe4bfcf86e453fc0bf566e1b0e /source/blender/blenkernel/intern/pointcache.c
parent7f56023e9bd95e8817556e0c6ae317434a1bee5a (diff)
quiet some clang warnings & fix for bugs in exceptional cases.
- ghost C api, BLI_get_folder_version() could assign garbage values. - pointcache ptcache_find_frames_around() had a superfluous NULL check which would have crashed anyway if actually NULL.
Diffstat (limited to 'source/blender/blenkernel/intern/pointcache.c')
-rw-r--r--source/blender/blenkernel/intern/pointcache.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index a8c7266b3fa..179aab064b4 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1373,11 +1373,13 @@ static void ptcache_find_frames_around(PTCacheID *pid, unsigned int frame, int *
while(pm->next && pm->next->frame < frame)
pm= pm->next;
- if(pm2 && pm2->frame < frame)
+ if(pm2->frame < frame) {
pm2 = NULL;
+ }
else {
- while(pm2->prev && pm2->prev->frame > frame)
+ while(pm2->prev && pm2->prev->frame > frame) {
pm2= pm2->prev;
+ }
}
if(pm && !pm2) {