[Bf-blender-cvs] [de5952c] alembic: Removed optimization by applying cache shrinkwrap modifier only in the realtime pass.

[Lukas Tönne]

Commit: de5952c3d696fbb71365f20c66c14c22ac399477
Author: Lukas Tönne
Date:   Sun May 3 11:53:51 2015 +0200
Branches: alembic
https://developer.blender.org/rBde5952c3d696fbb71365f20c66c14c22ac399477

Removed optimization by applying cache shrinkwrap modifier only in the
realtime pass.

As with hair sim, this would be preferable, but is causing too many
problems with the current cache archive layout.

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

M	source/blender/blenkernel/intern/cache_library.c
M	source/blender/makesrna/intern/rna_cache_library.c

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

diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index b9ac9cd..8d59020 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -1110,7 +1110,7 @@ static void shrinkwrap_data_free(ShrinkWrapCacheData *data)
 	}
 }
 
-static void shrinkwrap_apply_vertex(ShrinkWrapCacheModifier *smd, ShrinkWrapCacheData *data, ShrinkWrapCacheInstance *inst, StrandsVertex *vertex, StrandsMotionState *UNUSED(state))
+static void shrinkwrap_apply_vertex(ShrinkWrapCacheModifier *UNUSED(smd), ShrinkWrapCacheData *data, ShrinkWrapCacheInstance *inst, StrandsVertex *vertex, StrandsMotionState *UNUSED(state))
 {
 //	const float *point = state->co;
 //	float *npoint = state->co;
@@ -1167,7 +1167,7 @@ static void shrinkwrap_apply(ShrinkWrapCacheModifier *smd, ShrinkWrapCacheData *
 	}
 }
 
-static void shrinkwrap_process(ShrinkWrapCacheModifier *smd, CacheProcessContext *UNUSED(ctx), CacheProcessData *data, int frame, int frame_prev, eCacheLibrary_EvalMode eval_mode)
+static void shrinkwrap_process(ShrinkWrapCacheModifier *smd, CacheProcessContext *UNUSED(ctx), CacheProcessData *data, int frame, int frame_prev, eCacheLibrary_EvalMode UNUSED(eval_mode))
 {
 	Object *ob = smd->object;
 	DupliObject *dob;
@@ -1177,10 +1177,6 @@ static void shrinkwrap_process(ShrinkWrapCacheModifier *smd, CacheProcessContext
 	
 	ShrinkWrapCacheData shrinkwrap;
 	
-	/* only perform hair sim once */
-	if (eval_mode != CACHE_LIBRARY_EVAL_REALTIME)
-		return;
-	
 	/* skip first step and potential backward steps */
 	if (frame <= frame_prev)
 		return;
diff --git a/source/blender/makesrna/intern/rna_cache_library.c b/source/blender/makesrna/intern/rna_cache_library.c
index 99f2a24..f205433 100644
--- a/source/blender/makesrna/intern/rna_cache_library.c
+++ b/source/blender/makesrna/intern/rna_cache_library.c
@@ -102,11 +102,13 @@ static void rna_CacheModifier_update(Main *UNUSED(bmain), Scene *UNUSED(scene),
 {
 }
 
+#if 0 /* unused */
 static void rna_CacheModifier_dependency_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	rna_CacheModifier_update(bmain, scene, ptr);
 	DAG_relations_tag_update(bmain);
 }
+#endif
 
 
 static StructRNA *rna_CacheModifier_refine(struct PointerRNA *ptr)