Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / physics / particle_object.c
index 1e643ea7277934355cda85cea9e6918f7096bc36..c4ed32e874360d0d9150ad24405716ab25dc9805 100644 (file)
@@ -997,7 +997,7 @@ static void remove_particle_systems_from_object(Object *ob_to)
        
        if (ob_to->type != OB_MESH)
                return;
-       if (!ob_to->data || ID_IS_LINKED_DATABLOCK(ob_to->data))
+       if (!ob_to->data || ID_IS_LINKED(ob_to->data))
                return;
        
        for (md = ob_to->modifiers.first; md; md = md_next) {
@@ -1038,7 +1038,7 @@ static bool copy_particle_systems_to_object(const bContext *C,
 
        if (ob_to->type != OB_MESH)
                return false;
-       if (!ob_to->data || ID_IS_LINKED_DATABLOCK(ob_to->data))
+       if (!ob_to->data || ID_IS_LINKED(ob_to->data))
                return false;
        
        /* For remapping we need a valid DM.