Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2007-11-30 10:41:22 +0300
committerJanne Karhu <jhkarh@gmail.com>2007-11-30 10:41:22 +0300
commit04a009b047e13f6696b6780419b1561ef29c9854 (patch)
treebea9fa76182265c30e8fbfbb41bf24346b56ec80 /source/blender/blenkernel
parente893c9d739ed36a2d0aba50f231dba31cdcd2132 (diff)
Point cache was reset in many updates where it shouldn't have been reset.
Preview render crashed with "only render" children.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 1c7d235cd90..bee1250a173 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -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));