kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for [#11136] Segmentation fault when copying objects with hairs

Browse Source
This commit is contained in:
Campbell Barton 2008-05-11 11:34:39 +00:00
parent aa471f6a80
commit a2528b4123
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1054,7 +1054,11 @@ ParticleSystem *copy_particlesystem(ParticleSystem *psys)
psysn->childcache= NULL; psysn->childcache= NULL;
psysn->edit= NULL; psysn->edit= NULL;
psysn->effectors.first= psysn->effectors.last= 0; psysn->effectors.first= psysn->effectors.last= 0;
psysn->pathcachebufs.first = psysn->pathcachebufs.last = NULL;
psysn->reactevents.first = psysn->reactevents.last = NULL;
psysn->renderdata = NULL;
psysn->pointcache= BKE_ptcache_copy(psys->pointcache); psysn->pointcache= BKE_ptcache_copy(psys->pointcache);
id_us_plus((ID *)psysn->part); id_us_plus((ID *)psysn->part);

2
source/blender/makesdna/DNA_particle_types.h
View File

@ -168,7 +168,7 @@ typedef struct ParticleSettings {
struct PartDeflect *pd; struct PartDeflect *pd;
} ParticleSettings; } ParticleSettings;
typedef struct ParticleSystem{ typedef struct ParticleSystem{ /* note, make sure all (runtime) are NULL's in copy_particlesystem */
struct ParticleSystem *next, *prev; struct ParticleSystem *next, *prev;
ParticleSettings *part; /* particle settings */ ParticleSettings *part; /* particle settings */