[Bf-blender-cvs] [c836cba] alembic: Don't disable hair sim during the render pass.

Lukas Tönne noreply at git.blender.org
Thu Apr 23 18:45:41 CEST 2015


Commit: c836cbab111245cfb9c50439b0fa269473f8e4d7
Author: Lukas Tönne
Date:   Thu Apr 23 18:43:20 2015 +0200
Branches: alembic
https://developer.blender.org/rBc836cbab111245cfb9c50439b0fa269473f8e4d7

Don't disable hair sim during the render pass.

This otherwise prevents hair simulation motion showing up in renders.

The Alembic structure will have to be redesigned anyway. The current
concept of storing two separate entire scenes for viewport/render will
be replaced by a per-object detail level system. This allows performing
hair simulation only once and still use different resolutions etc.
where appropriate.

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

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

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

diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index b1aaae8..0b9512c 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -935,8 +935,8 @@ static void hairsim_process(HairSimCacheModifier *hsmd, CacheProcessContext *ctx
 	struct Implicit_Data *solver_data;
 	
 	/* only perform hair sim once */
-	if (eval_mode != CACHE_LIBRARY_EVAL_REALTIME)
-		return;
+//	if (eval_mode != CACHE_LIBRARY_EVAL_REALTIME)
+//		return;
 	
 	/* skip first step and potential backward steps */
 	if (frame <= frame_prev)




More information about the Bf-blender-cvs mailing list