diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-30 03:41:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-30 03:41:09 +0400 |
| commit | 75697c40a039e8f64573bedd5211c442e2af9e9c (patch) | |
| tree | af111682037c4568eec377984005928046d867b6 /source/blender/editors/object/object_edit.c | |
| parent | c2696ae63182da338d69a5127f03b1ad8b88f6c9 (diff) | |
| parent | d7bf9688ac78169a37fbfc0d3d5bcd5b5be19170 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22717:22875
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 4b7d3474d98..04187c93196 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -6367,6 +6367,17 @@ static Base *object_add_duplicate_internal(Scene *scene, Base *base, int dupflag } } } + if(dupflag & USER_DUP_PSYS) { + ParticleSystem *psys; + for(psys=obn->particlesystem.first; psys; psys=psys->next) { + id= (ID*) psys->part; + if(id) { + ID_NEW_US(psys->part) + else psys->part= psys_copy_settings(psys->part); + id->us--; + } + } + } id= obn->data; didit= 0; |