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

Bugfix:

Browse Source 
Duplicating or separating objects with a particle system could crash.
This commit is contained in:
Brecht Van Lommel
2007-12-01 20:08:31 +00:00
parent eff09ae396
commit 475cf46d61
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/object.c
View File

@@ -1006,12 +1006,26 @@ SoftBody *copy_softbody(SoftBody *sb)
ParticleSystem *copy_particlesystem(ParticleSystem *psys) ParticleSystem *copy_particlesystem(ParticleSystem *psys)
{ {
ParticleSystem *psysn; ParticleSystem *psysn;
ParticleData *pa;
int a;
psysn= MEM_dupallocN(psys); psysn= MEM_dupallocN(psys);
psysn->particles= MEM_dupallocN(psys->particles); psysn->particles= MEM_dupallocN(psys->particles);
psysn->child= MEM_dupallocN(psys->child); psysn->child= MEM_dupallocN(psys->child);
for(a=0, pa=psysn->particles; a<psysn->totpart; a++, pa++) {
if(pa->hair)
pa->hair= MEM_dupallocN(pa->hair);
if(pa->keys)
pa->keys= MEM_dupallocN(pa->keys);
}
if(psys->soft)
psysn->soft= copy_softbody(psys->soft);
psysn->pathcache= NULL;
psysn->childcache= NULL;
psysn->edit= NULL;
psysn->effectors.first= psysn->effectors.last= 0; psysn->effectors.first= psysn->effectors.last= 0;
id_us_plus((ID *)psysn->part); id_us_plus((ID *)psysn->part);