[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14785] trunk/blender/source/blender: fix for [#11136] Segmentation fault when copying objects with hairs

[Campbell Barton]

Revision: 14785
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14785
Author:   campbellbarton
Date:     2008-05-11 13:34:39 +0200 (Sun, 11 May 2008)

Log Message:
-----------
fix for [#11136] Segmentation fault when copying objects with hairs

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/makesdna/DNA_particle_types.h

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2008-05-11 06:11:23 UTC (rev 14784)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2008-05-11 11:34:39 UTC (rev 14785)
@@ -1054,7 +1054,11 @@
 	psysn->childcache= NULL;
 	psysn->edit= NULL;
 	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);
 
 	id_us_plus((ID *)psysn->part);

Modified: trunk/blender/source/blender/makesdna/DNA_particle_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_particle_types.h	2008-05-11 06:11:23 UTC (rev 14784)
+++ trunk/blender/source/blender/makesdna/DNA_particle_types.h	2008-05-11 11:34:39 UTC (rev 14785)
@@ -168,7 +168,7 @@
 	struct PartDeflect *pd;
 } ParticleSettings;
 
-typedef struct ParticleSystem{
+typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in copy_particlesystem */
 	struct ParticleSystem *next, *prev;
 
 	ParticleSettings *part;					/* particle settings */