[Bf-blender-cvs] [e91f9f664d0] blender-v2.79-release: Rigidbody: Fix regression introduced in ee3fadd

Sergej Reich noreply at git.blender.org
Fri Sep 8 12:08:12 CEST 2017


Commit: e91f9f664d08508faae22b5bbcd52022f1f5ff98
Author: Sergej Reich
Date:   Tue Sep 5 19:53:32 2017 +0200
Branches: blender-v2.79-release
https://developer.blender.org/rBe91f9f664d08508faae22b5bbcd52022f1f5ff98

Rigidbody: Fix regression introduced in ee3fadd

Baking rigid body cache was broken if some cached frames already
existed.

This is just a band aid for release, the logic need to be looked into
further.

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

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

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

diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index a7e00a8103a..dd394b441f3 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -3618,7 +3618,13 @@ void BKE_ptcache_bake(PTCacheBaker *baker)
 						psys_get_pointcache_start_end(scene, pid->calldata, &cache->startframe, &cache->endframe);
 					}
 
-					if (((cache->flag & PTCACHE_BAKED) == 0) && (render || bake)) {
+					// XXX workaround for regression inroduced in ee3fadd, needs looking into
+					if (pid->type == PTCACHE_TYPE_RIGIDBODY) {
+						if ((cache->flag & PTCACHE_REDO_NEEDED || (cache->flag & PTCACHE_SIMULATION_VALID)==0) && (render || bake)) {
+							BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0);
+						}
+					}
+					else if (((cache->flag & PTCACHE_BAKED) == 0) && (render || bake)) {
 						BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0);
 					}



More information about the Bf-blender-cvs mailing list