Revision: 14925 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14925 Author: blendix Date: 2008-05-22 15:58:16 +0200 (Thu, 22 May 2008)
Log Message: ----------- Fix for bug #11758: crash cancelling hair softbody bake. Fix for bug #11966: crash in hair softbody with hair amount 0. Modified Paths: -------------- trunk/blender/source/blender/blenkernel/intern/particle.c trunk/blender/source/blender/blenkernel/intern/softbody.c Modified: trunk/blender/source/blender/blenkernel/intern/particle.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/particle.c 2008-05-22 13:57:06 UTC (rev 14924) +++ trunk/blender/source/blender/blenkernel/intern/particle.c 2008-05-22 13:58:16 UTC (rev 14925) @@ -2401,8 +2401,11 @@ psys->pathcache= cache; } - if(edit==NULL && psys->soft && psys->softflag & OB_SB_ENABLE) + if(edit==NULL && psys->soft && psys->softflag & OB_SB_ENABLE) { soft = psys->soft; + if(!soft->bpoint) + soft= NULL; + } psys->lattice = psys_get_lattice(ob, psys); ma= give_current_material(ob, psys->part->omat); Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/softbody.c 2008-05-22 13:57:06 UTC (rev 14924) +++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2008-05-22 13:58:16 UTC (rev 14925) @@ -3390,8 +3390,9 @@ int a; /* update the vertex locations */ - if(sb->particles) { + if(sb->particles && sb->particles->totpart>0) { psmd= psys_get_modifier(ob,sb->particles); + pa= sb->particles->particles; key= pa->hair; @@ -3434,7 +3435,7 @@ float hairmat[4][4]; int a; - if(sb->particles) { + if(sb->particles && sb->particles->totpart>0) { psmd= psys_get_modifier(ob, sb->particles); pa= sb->particles->particles; key= pa->hair; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs