[Bf-blender-cvs] [238f3ac] alembic_pointcache: Main argument is no longer needed for cache reading, the cachelib is now given explicitly.

[Lukas Tönne]

Commit: 238f3ac972ae1a5b3eca2178d564cd3a070b852f
Author: Lukas Tönne
Date:   Wed Mar 18 16:12:07 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB238f3ac972ae1a5b3eca2178d564cd3a070b852f

Main argument is no longer needed for cache reading, the cachelib is
now given explicitly.

===================================================================

M       source/blender/blenkernel/BKE_cache_library.h
M       source/blender/blenkernel/intern/cache_library.c
M       source/blender/blenkernel/intern/object_dupli.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_cache_library.h 
b/source/blender/blenkernel/BKE_cache_library.h
index eda53f2..a25c21d 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 20d2b77..bdb7a8a 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 9adb190..bc409ff 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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs