diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
| commit | df1c88b652e6977491b7f2b019c326518ccdc320 (patch) | |
| tree | d3cfdaef8f3ea0744f5f666679dadc6425501711 /source/blender/imbuf | |
| parent | 2589f55a55bc9682111ab266bb89d8f08713f374 (diff) | |
| parent | ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/moviecache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index 89955711384..daf062f5499 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -513,7 +513,7 @@ void IMB_moviecache_get_cache_segments(MovieCache *cache, int proxy, int render_ *points_r = cache->points; } else { - int totframe = BLI_ghash_size(cache->hash); + int totframe = BLI_ghash_len(cache->hash); int *frames = MEM_callocN(totframe * sizeof(int), "movieclip cache frames"); int a, totseg = 0; GHashIterator gh_iter; |