Merge remote-tracking branch 'origin/master' into blender2.8

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

diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index d1232fd2aabb92ea1c52bfbaea0fdac0cb646945..41c1669adddf702b0ffc41fb2c4dca42e80381f5 100644 (file)
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -43,7 +43,6 @@
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meta_types.h"
-#include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_world_types.h"
 #include "DNA_object_types.h"
@@ -2219,7 +2218,6 @@ static int make_local_exec(bContext *C, wmOperator *op)
        Main *bmain = CTX_data_main(C);
        Scene *scene = CTX_data_scene(C);
        AnimData *adt;
-       ParticleSystem *psys;
        Material *ma, ***matarar;
        Lamp *la;
        ID *id;
@@ -2287,9 +2285,6 @@ static int make_local_exec(bContext *C, wmOperator *op)
                        }
                }
 
-               for (psys = ob->particlesystem.first; psys; psys = psys->next)
-                       id_make_local(bmain, &psys->part->id, false, false);
-
                adt = BKE_animdata_from_id(&ob->id);
                if (adt) BKE_animdata_make_local(adt);
        }