diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-18 18:12:07 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-26 16:13:39 +0300 |
commit | cf5a4256a89c3459cb60edd3d31764292675043f (patch) | |
tree | 9c8f0caa0eebd6c08a3ff436cfa31e263e429200 /source | |
parent | ca8b8d9309795c547af50a5145c2eb33c66198ad (diff) |
Main argument is no longer needed for cache reading, the cachelib is
now given explicitly.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_cache_library.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cache_library.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_cache_library.h b/source/blender/blenkernel/BKE_cache_library.h index eda53f2fd94..a25c21d3fcf 100644 --- a/source/blender/blenkernel/BKE_cache_library.h +++ b/source/blender/blenkernel/BKE_cache_library.h @@ -100,7 +100,7 @@ void BKE_cache_archive_path(const char *path, ID *id, Library *lib, char *result void BKE_cache_library_dag_recalc_tag(struct EvaluationContext *eval_ctx, struct Main *bmain); -bool BKE_cache_read_dupligroup(struct Main *bmain, struct Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode, +bool BKE_cache_read_dupligroup(struct Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode, struct Group *dupgroup, struct DupliCache *dupcache, struct CacheLibrary *cachelib); #endif diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c index 20d2b775bbb..bdb7a8a605e 100644 --- a/source/blender/blenkernel/intern/cache_library.c +++ b/source/blender/blenkernel/intern/cache_library.c @@ -648,7 +648,7 @@ void BKE_cache_archive_path(const char *path, ID *id, Library *lib, char *result } -bool BKE_cache_read_dupligroup(Main *bmain, Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode, +bool BKE_cache_read_dupligroup(Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode, struct Group *dupgroup, struct DupliCache *dupcache, CacheLibrary *cachelib) { char filename[FILE_MAX]; diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 9adb19047e7..bc409ffae01 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -1395,7 +1395,6 @@ static DupliObject *dupli_cache_add_object(DupliCache *dupcache) void BKE_object_dupli_cache_update(Scene *scene, Object *ob, EvaluationContext *eval_ctx, float frame) { const eCacheLibrary_EvalMode eval_mode = eval_ctx->mode == DAG_EVAL_RENDER ? CACHE_LIBRARY_EVAL_RENDER : CACHE_LIBRARY_EVAL_VIEWPORT; - Main *bmain = G.main; bool is_dupligroup = (ob->transflag & OB_DUPLIGROUP) && ob->dup_group; bool is_cached = (ob->transflag & OB_DUPLI_USE_CACHE) && ob->cache_library; @@ -1418,7 +1417,7 @@ void BKE_object_dupli_cache_update(Scene *scene, Object *ob, EvaluationContext * } /* TODO at this point we could apply animation offset */ - BKE_cache_read_dupligroup(bmain, scene, frame, eval_mode, ob->dup_group, ob->dup_cache, ob->cache_library); + BKE_cache_read_dupligroup(scene, frame, eval_mode, ob->dup_group, ob->dup_cache, ob->cache_library); ob->dup_cache->flag &= ~DUPCACHE_FLAG_DIRTY; ob->dup_cache->cfra = frame; |