diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-04 18:37:11 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-04 18:37:11 +0300 |
| commit | ff5fa0df18b6f03f5c9412756b001b19ac36585e (patch) | |
| tree | ec38b9b56845aadf265d9bf6ca3f3cd701a59fc6 /source/blender/blenkernel/intern/object.c | |
| parent | 62b139385a1a4c59dc966b4ffdfe0c6e1fb92690 (diff) | |
| parent | bf7e8b42fa269c310e456fa55263ff2d9849804e (diff) | |
Merge branch 'strand_editmode' into alembic
Conflicts:
source/blender/editors/space_view3d/drawstrands.c
source/blender/editors/space_view3d/view3d_intern.h
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 9be3a107396..c55bd2b0aca 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1334,6 +1334,7 @@ ParticleSystem *BKE_object_copy_particlesystem(ParticleSystem *psys) psysn->pathcache = NULL; psysn->childcache = NULL; psysn->edit = NULL; + psysn->hairedit = NULL; psysn->pdd = NULL; psysn->effectors = NULL; psysn->tree = NULL; |