archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Point cache was reset in many updates where it shouldn't have been reset.

Browse Source 
Preview render crashed with "only render" children.
This commit is contained in:
Janne Karhu
2007-11-30 07:41:22 +00:00
parent e893c9d739
commit 04a009b047
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/particle_system.c
View File

@@ -4271,7 +4271,7 @@ void psys_to_softbody(Object *ob, ParticleSystem *psys, int force_recalc)
if((psys->softflag&OB_SB_ENABLE)==0) return;
if(ob->recalc && (ob->recalc&OB_RECALC_TIME)==0)
if(psys->recalc || force_recalc)
psys->softflag|=OB_SB_REDO;
/* let's replace the object's own softbody with the particle softbody */
@@ -4284,12 +4284,6 @@ void psys_to_softbody(Object *ob, ParticleSystem *psys, int force_recalc)
/* swich to new ones */
ob->soft=psys->soft;
ob->softflag=psys->softflag;
/* signal for before/free bake */
//if(psys->flag & PSYS_SOFT_BAKE || force_recalc){
// sbObjectToSoftbody(ob);
// psys->flag &= ~PSYS_SOFT_BAKE;
//}
/* do softbody */
sbObjectStep(ob, (float)G.scene->r.cfra, NULL, psys_count_keys(psys));