Merge branch 'master' into blender2.8

[blender.git] / source / blender / editors / object / object_add.c

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 09c9442db54dd8c565c54277d52e4505aa883b6d..0ceb177164ad155c77eaeac353a874d522320b7f 100644 (file)
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -80,7 +80,6 @@
 #include "BKE_mesh.h"
 #include "BKE_nla.h"
 #include "BKE_object.h"
-#include "BKE_particle.h"
 #include "BKE_report.h"
 #include "BKE_sca.h"
 #include "BKE_scene.h"
@@ -1924,23 +1923,6 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
                                }
                        }
                }
-               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 = BKE_particlesettings_copy(psys->part);
-
-                                       if (dupflag & USER_DUP_ACT) {
-                                               BKE_animdata_copy_id_action(&psys->part->id);
-                                       }
-
-                                       id_us_min(id);
-                               }
-                       }
-               }
 
                id = obn->data;
                didit = 0;