[Bf-blender-cvs] [0fd31c53ee1] master: Rigidbody: Fix regression introduced in ee3fadd

Sergej Reich noreply at git.blender.org
Tue Sep 5 20:00:22 CEST 2017


Commit: 0fd31c53ee1a424209803cc6410ab5706a170662
Author: Sergej Reich
Date:   Tue Sep 5 19:53:32 2017 +0200
Branches: master
https://developer.blender.org/rB0fd31c53ee1a424209803cc6410ab5706a170662

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 2a61efcd1f9..7a1b378b3c4 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -3619,7 +3619,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